Skip to content

Commit c54c744

Browse files
oestebanoesteban
authored
Merge pull request #3015 from nipy/rel/1.2.2
REL: 1.2.2
2 parents 13a7556 + 5f8be53 commit c54c744

File tree

6 files changed

+65
-39
lines changed

6 files changed

+65
-39
lines changed

‎.mailmap

+6
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Michael Waskom <[email protected]> mwaskom <[email protected]>
151151
Michael Waskom <[email protected]> mwaskom <[email protected]>
152152
Michael Waskom <[email protected]> mwaskom <[email protected]>
153153
Miguel Molina-Romero <[email protected]> Miguel Molina <[email protected]>
154+
Murat Bilgel <[email protected]> Murat Bilgel <[email protected]>
154155
Oliver Contier <[email protected]> oliver-contier <[email protected]>
155156
Oscar Esteban <[email protected]> Oscar Esteban <code@oscaresteban>
156157
Oscar Esteban <[email protected]> oesteban <[email protected]>
@@ -160,6 +161,7 @@ Paul Sharp <[email protected]> psharp1289 <[email protected]>
160161
Ranjit Khanuja <[email protected]> RanjitK <[email protected]>
161162
Rastko Ćirić <[email protected]> rciric <[email protected]>
162163
Rastko Ćirić <[email protected]> Rastko Ćirić <[email protected]>
164+
Rastko Ćirić <[email protected]> rciric <[email protected]>
163165
Ross Markello <[email protected]> Ross Markello <[email protected]>
164166
Russell Poldrack <[email protected]> Russ Poldrack <[email protected]>
165167
Russell Poldrack <[email protected]> poldrack <[email protected]>
@@ -182,7 +184,11 @@ Siqi Liu <[email protected]> sql <[email protected]>
182184
Steven Giavasis <[email protected]> Steven Giavasis <[email protected]>
183185
Steven Giavasis <[email protected]> sgiavasis <[email protected]>
184186
Steven Giavasis <[email protected]> sgiavasis <[email protected]>
187+
Steven Tilley <[email protected]> Steven Tilley <[email protected]>
185188
Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
189+
Victor Férat <[email protected]> Victor <[email protected]>
190+
Victor Férat <[email protected]> Victor Ferat <[email protected]>
191+
Victor Férat <[email protected]> Victor Férat <[email protected]>
186192
Victor Saase <[email protected]> vsaase <[email protected]>
187193
Weijie Huang <[email protected]> forwho <[email protected]>
188194
William Triplett <[email protected]> William Triplett <[email protected]>

‎.zenodo.json

+42-37
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
"affiliation": "Shattuck Lab, UCLA Brain Mapping Center",
7979
"name": "Wong, Jason"
8080
},
81-
{
82-
"affiliation": "Concordia University",
83-
"name": "Benderoff, Erin"
84-
},
8581
{
8682
"name": "Modat, Marc"
8783
},
@@ -150,6 +146,10 @@
150146
{
151147
"name": "Berleant, Shoshana"
152148
},
149+
{
150+
"affiliation": "Concordia University",
151+
"name": "Benderoff, Erin"
152+
},
153153
{
154154
"affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich",
155155
"name": "Christian, Horea",
@@ -355,15 +355,15 @@
355355
{
356356
"name": "Erickson, Drew"
357357
},
358-
{
359-
"affiliation": "Child Mind Institute",
360-
"name": "Giavasis, Steven"
361-
},
362358
{
363359
"affiliation": "NIMH IRP",
364360
"name": "Lee, John A.",
365361
"orcid": "0000-0001-5884-4247"
366362
},
363+
{
364+
"affiliation": "Child Mind Institute",
365+
"name": "Giavasis, Steven"
366+
},
367367
{
368368
"name": "Correa, Carlos"
369369
},
@@ -381,9 +381,6 @@
381381
{
382382
"name": "Millman, Jarrod"
383383
},
384-
{
385-
"name": "Lai, Jeff"
386-
},
387384
{
388385
"name": "Zhou, Dale"
389386
},
@@ -393,23 +390,28 @@
393390
{
394391
"name": "Haselgrove, Christian"
395392
},
393+
{
394+
"affiliation": "Holland Bloorview Kids Rehabilitation Hospital",
395+
"name": "Tilley II, Steven",
396+
"orcid": "0000-0003-4853-5082"
397+
},
396398
{
397399
"name": "Renfro, Mandy"
398400
},
399401
{
400402
"affiliation": "The University of Sydney",
401403
"name": "Liu, Siqi"
402404
},
403-
{
404-
"affiliation": "Leibniz Institute for Neurobiology",
405-
"name": "Stadler, J\u00f6rg",
406-
"orcid": "0000-0003-4313-129X"
407-
},
408405
{
409406
"affiliation": "University of Pennsylvania",
410407
"name": "Kahn, Ari E.",
411408
"orcid": "0000-0002-2127-0507"
412409
},
410+
{
411+
"affiliation": "Leibniz Institute for Neurobiology",
412+
"name": "Stadler, J\u00f6rg",
413+
"orcid": "0000-0003-4313-129X"
414+
},
413415
{
414416
"affiliation": "University College London",
415417
"name": "P\u00e9rez-Garc\u00eda, Fernando",
@@ -502,31 +504,26 @@
502504
"name": "Perkins, L. Nathan"
503505
},
504506
{
505-
"affiliation": "University of Amsterdam",
506-
"name": "Lukas Snoek",
507-
"orcid": "0000-0001-8972-204X"
507+
"name": "Marina, Ana"
508508
},
509509
{
510-
"affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
511-
"name": "Weninger, Leon"
510+
"name": "Mattfeld, Aaron"
512511
},
513512
{
514-
"affiliation": "Stanford University",
515-
"name": "Lerma-Usabiaga, Garikoitz",
516-
"orcid": "0000-0001-9800-4816"
513+
"name": "Noel, Maxime"
517514
},
518515
{
519-
"name": "Marina, Ana"
516+
"affiliation": "University of Amsterdam",
517+
"name": "Lukas Snoek",
518+
"orcid": "0000-0001-8972-204X"
520519
},
521520
{
522-
"name": "Mattfeld, Aaron"
521+
"affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany",
522+
"name": "Weninger, Leon"
523523
},
524524
{
525525
"name": "Matsubara, K"
526526
},
527-
{
528-
"name": "Noel, Maxime"
529-
},
530527
{
531528
"name": "Cheung, Brian"
532529
},
@@ -573,9 +570,6 @@
573570
{
574571
"name": "Weinstein, Alejandro"
575572
},
576-
{
577-
"name": "Tambini, Arielle"
578-
},
579573
{
580574
"affiliation": "Duke University",
581575
"name": "Broderick, William",
@@ -598,6 +592,11 @@
598592
{
599593
"name": "Khanuja, Ranjeet"
600594
},
595+
{
596+
"affiliation": "National Institute on Aging, Baltimore, MD, USA",
597+
"name": "Bilgel, Murat",
598+
"orcid": "0000-0001-5042-7422"
599+
},
601600
{
602601
"name": "Schlamp, Kai"
603602
},
@@ -612,6 +611,9 @@
612611
{
613612
"name": "Tarbert, Claire"
614613
},
614+
{
615+
"name": "Tambini, Arielle"
616+
},
615617
{
616618
"name": "Nickson, Thomas"
617619
},
@@ -636,6 +638,11 @@
636638
{
637639
"name": "Flandin, Guillaume"
638640
},
641+
{
642+
"affiliation": "Stanford University",
643+
"name": "Lerma-Usabiaga, Garikoitz",
644+
"orcid": "0000-0001-9800-4816"
645+
},
639646
{
640647
"affiliation": "Vrije Universiteit Amsterdam",
641648
"name": "Ort, Eduard"
@@ -691,15 +698,13 @@
691698
"name": "Mihai, Paul Glad",
692699
"orcid": "0000-0001-5715-6442"
693700
},
701+
{
702+
"name": "Lai, Jeff"
703+
},
694704
{
695705
"affiliation": "MIT, HMS",
696706
"name": "Ghosh, Satrajit",
697707
"orcid": "0000-0002-5312-6729"
698-
},
699-
{
700-
"affiliation": "Holland Bloorview Kids Rehabilitation Hospital",
701-
"name": "Tilley II, Steven",
702-
"orcid": "0000-0003-4853-5082"
703708
}
704709
],
705710
"keywords": [

‎doc/changelog/1.X.X-changelog

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
1.2.2 (September 05, 2019)
2+
==========================
3+
4+
##### [Full changelog](https://github.com/nipy/nipype/milestone/33?closed=1)
5+
6+
* FIX: Ensure ``loadpkl`` returns a not None value (https://github.com/nipy/nipype/pull/3020)
7+
* FIX: ``loadpkl`` failed when pklz file contained versioning info (https://github.com/nipy/nipype/pull/3017)
8+
* FIX: Update mne.WatershedBEM command line (https://github.com/nipy/nipype/pull/3007)
9+
* FIX: Specify correct stop criterion flag in PETPVC (https://github.com/nipy/nipype/pull/3010)
10+
* ENH: Additional arguments to ANTs N4BiasFieldCorrection (https://github.com/nipy/nipype/pull/3012)
11+
* ENH: Add ``--rescale-intensities`` and name_source to N4BiasFieldCorrection (https://github.com/nipy/nipype/pull/3011)
12+
* ENH: Add index_mask_file input to ImageStats (https://github.com/nipy/nipype/pull/3005)
13+
* MAINT: Add ``python_requires`` to package metadata (https://github.com/nipy/nipype/pull/3006)
14+
115
1.2.1 (August 19, 2019)
216
=======================
317

‎doc/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
# The short X.Y version.
8383
version = nipype.__version__
8484
# The full version, including alpha/beta/rc tags.
85-
release = "1.2.1"
85+
release = "1.2.2"
8686

8787
# The language for content autogenerated by Sphinx. Refer to documentation
8888
# for a list of supported languages.

‎nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# nipype version information
1111
# Remove -dev for release
12-
__version__ = '1.2.2-dev'
12+
__version__ = '1.2.2'
1313

1414

1515
def get_nipype_gitversion():

‎tools/update_zenodo.py

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"Leipzig, Germany.",
5959
"name": "Mihai, Paul Glad",
6060
"orcid": "0000-0001-5715-6442"},
61+
{"name": "Lai, Jeff"}
6162
]
6263

6364
for entry in missing_entries:

0 commit comments

Comments
 (0)