Skip to content

Commit 54f5029

Browse files
committed
Merge remote-tracking branch 'upstream/rel/1.6.0'
2 parents f054c29 + d32e5bf commit 54f5029

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

.zenodo.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,16 @@
406406
"affiliation": "University of Iowa",
407407
"name": "Welch, David"
408408
},
409+
{
410+
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
411+
"name": "Waller, Lea",
412+
"orcid": "0000-0002-3239-6957"
413+
},
414+
{
415+
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
416+
"name": "Contier, Oliver",
417+
"orcid": "0000-0002-2983-4709"
418+
},
409419
{
410420
"affiliation": "Department of Psychology, Stanford University",
411421
"name": "Triplett, William",
@@ -486,18 +496,17 @@
486496
"affiliation": "Boston University",
487497
"name": "Perkins, L. Nathan"
488498
},
489-
{
490-
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
491-
"name": "Contier, Oliver",
492-
"orcid": "0000-0002-2983-4709"
493-
},
494499
{
495500
"name": "Zhou, Dale"
496501
},
497502
{
498503
"name": "Bielievtsov, Dmytro",
499504
"orcid": "0000-0003-3846-7696"
500505
},
506+
{
507+
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
508+
"name": "Ben-Zvi, Gal"
509+
},
501510
{
502511
"affiliation": "University of Newcastle, Australia",
503512
"name": "Cooper, Gavin",
@@ -513,11 +522,6 @@
513522
"name": "Linkersd\u00f6rfer, Janosch",
514523
"orcid": "0000-0002-1577-1233"
515524
},
516-
{
517-
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
518-
"name": "Waller, Lea",
519-
"orcid": "0000-0002-3239-6957"
520-
},
521525
{
522526
"name": "Renfro, Mandy"
523527
},
@@ -565,6 +569,11 @@
565569
"name": "Margulies, Daniel S.",
566570
"orcid": "0000-0002-8880-9204"
567571
},
572+
{
573+
"affiliation": "CNRS, UMS3552 IRMaGe",
574+
"name": "Condamine, Eric",
575+
"orcid": "0000-0002-9533-3769"
576+
},
568577
{
569578
"affiliation": "Dartmouth College",
570579
"name": "Ma, Feilong",
@@ -634,11 +643,6 @@
634643
"affiliation": "Vrije Universiteit Amsterdam",
635644
"name": "Ort, Eduard"
636645
},
637-
{
638-
"affiliation": "CNRS, UMS3552 IRMaGe",
639-
"name": "Condamine, Eric",
640-
"orcid": "0000-0002-9533-3769"
641-
},
642646
{
643647
"affiliation": "Stanford University",
644648
"name": "Lerma-Usabiaga, Garikoitz",
@@ -697,10 +701,6 @@
697701
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
698702
"name": "Baratz, Zvi"
699703
},
700-
{
701-
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
702-
"name": "Ben-Zvi, Gal"
703-
},
704704
{
705705
"name": "Matsubara, K"
706706
},

doc/changelog/1.X.X-changelog.rst

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

nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# nipype version information
77
# Remove -dev for release
8-
__version__ = "1.6.0-dev"
8+
__version__ = "1.6.0"
99

1010

1111
def get_nipype_gitversion():

0 commit comments

Comments
 (0)