Merge remote-tracking branch 'upstream/rel/1.6.0'

nipy · Nov 28, 2020 · 54f5029 · 54f5029
2 parents f054c29 + d32e5bf
commit 54f5029
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 20 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -406,6 +406,16 @@
       "affiliation": "University of Iowa",
       "name": "Welch, David"
     },
+    {
+      "affiliation": "Charite Universitatsmedizin Berlin, Germany",
+      "name": "Waller, Lea",
+      "orcid": "0000-0002-3239-6957"
+    },
+    {
+      "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
+      "name": "Contier, Oliver",
+      "orcid": "0000-0002-2983-4709"
+    },
     {
       "affiliation": "Department of Psychology, Stanford University",
       "name": "Triplett, William",
@@ -486,18 +496,17 @@
       "affiliation": "Boston University",
       "name": "Perkins, L. Nathan"
     },
-    {
-      "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
-      "name": "Contier, Oliver",
-      "orcid": "0000-0002-2983-4709"
-    },
     {
       "name": "Zhou, Dale"
     },
     {
       "name": "Bielievtsov, Dmytro",
       "orcid": "0000-0003-3846-7696"
     },
+    {
+      "affiliation": "Sagol School of Neuroscience, Tel Aviv University",
+      "name": "Ben-Zvi, Gal"
+    },
     {
       "affiliation": "University of Newcastle, Australia",
       "name": "Cooper, Gavin",
@@ -513,11 +522,6 @@
       "name": "Linkersd\u00f6rfer, Janosch",
       "orcid": "0000-0002-1577-1233"
     },
-    {
-      "affiliation": "Charite Universitatsmedizin Berlin, Germany",
-      "name": "Waller, Lea",
-      "orcid": "0000-0002-3239-6957"
-    },
     {
       "name": "Renfro, Mandy"
     },
@@ -565,6 +569,11 @@
       "name": "Margulies, Daniel S.",
       "orcid": "0000-0002-8880-9204"
     },
+    {
+      "affiliation": "CNRS, UMS3552 IRMaGe",
+      "name": "Condamine, Eric",
+      "orcid": "0000-0002-9533-3769"
+    },
     {
       "affiliation": "Dartmouth College",
       "name": "Ma, Feilong",
@@ -634,11 +643,6 @@
       "affiliation": "Vrije Universiteit Amsterdam",
       "name": "Ort, Eduard"
     },
-    {
-      "affiliation": "CNRS, UMS3552 IRMaGe",
-      "name": "Condamine, Eric",
-      "orcid": "0000-0002-9533-3769"
-    },
     {
       "affiliation": "Stanford University",
       "name": "Lerma-Usabiaga, Garikoitz",
@@ -697,10 +701,6 @@
       "affiliation": "Sagol School of Neuroscience, Tel Aviv University",
       "name": "Baratz, Zvi"
     },
-    {
-      "affiliation": "Sagol School of Neuroscience, Tel Aviv University",
-      "name": "Ben-Zvi, Gal"
-    },
     {
       "name": "Matsubara, K"
     },

diff --git a/doc/changelog/1.X.X-changelog.rst b/doc/changelog/1.X.X-changelog.rst
@@ -1,3 +1,26 @@
+1.6.0 (November 28, 2020)
+=========================
+
+New feature release in the 1.6.x series.
+
+In addition to the usual bug fixes, significant reductions were made
+in workflow startup costs.
+
+(`Full changelog <https://github.com/nipy/nipype/milestone/1.6.0?closed=1>`__)
+
+  * FIX: Canonicalize environment dicts to strings in Windows (https://github.com/nipy/nipype/pull/3267)
+  * FIX: Purge deprecated exception content accesses (https://github.com/nipy/nipype/pull/3272)
+  * FIX: Handle changes in CLI structure of mrtrix3.DWIBiasCorrect (https://github.com/nipy/nipype/pull/3248)
+  * FIX: EpiReg changed to not list certain outputs when 'wmseg' input is specified (https://github.com/nipy/nipype/pull/3265)
+  * FIX: CI issues (https://github.com/nipy/nipype/pull/3262)
+  * FIX: SPM SliceTiming must accept either Int or float for ref_slice and sli… (https://github.com/nipy/nipype/pull/3255)
+  * FIX: Raise version error when using ``-g`` with ``antsAI`` < 2.3.0 (https://github.com/nipy/nipype/pull/3256)
+  * FIX: No longer depending on pydotplus (networkx >=2.0 update) (https://github.com/nipy/nipype/pull/3251)
+  * FIX: ANTs' utilities revision - bug fixes and add more operations to ``ants.ImageMath`` (https://github.com/nipy/nipype/pull/3236)
+  * ENH: Handle unavailable traits due to version differences (https://github.com/nipy/nipype/pull/3273)
+  * ENH: Optimize workflow.run performance (https://github.com/nipy/nipype/pull/3260)
+  * DOC: Remove myself (@mr-c) from the zenodo metadata (https://github.com/nipy/nipype/pull/3271)
+
 1.5.1 (August 16, 2020)
 =======================
 

diff --git a/nipype/info.py b/nipype/info.py
@@ -5,7 +5,7 @@
 
 # nipype version information
 # Remove -dev for release
-__version__ = "1.6.0-dev"
+__version__ = "1.6.0"
 
 
 def get_nipype_gitversion():