diff --git a/.mailmap b/.mailmap index 259fbe170d..946919557c 100644 --- a/.mailmap +++ b/.mailmap @@ -151,6 +151,7 @@ Michael Waskom mwaskom Michael Waskom mwaskom Michael Waskom mwaskom Miguel Molina-Romero Miguel Molina +Murat Bilgel Murat Bilgel Oliver Contier oliver-contier Oscar Esteban Oscar Esteban Oscar Esteban oesteban @@ -160,6 +161,7 @@ Paul Sharp psharp1289 Ranjit Khanuja RanjitK Rastko Ćirić rciric Rastko Ćirić Rastko Ćirić +Rastko Ćirić rciric Ross Markello Ross Markello Russell Poldrack Russ Poldrack Russell Poldrack poldrack @@ -182,7 +184,11 @@ Siqi Liu sql Steven Giavasis Steven Giavasis Steven Giavasis sgiavasis Steven Giavasis sgiavasis +Steven Tilley Steven Tilley Tristan Glatard Tristan Glatard +Victor Férat Victor +Victor Férat Victor Ferat +Victor Férat Victor Férat Victor Saase vsaase Weijie Huang forwho William Triplett William Triplett diff --git a/.zenodo.json b/.zenodo.json index bf1cb6f692..1850eec791 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -78,10 +78,6 @@ "affiliation": "Shattuck Lab, UCLA Brain Mapping Center", "name": "Wong, Jason" }, - { - "affiliation": "Concordia University", - "name": "Benderoff, Erin" - }, { "name": "Modat, Marc" }, @@ -150,6 +146,10 @@ { "name": "Berleant, Shoshana" }, + { + "affiliation": "Concordia University", + "name": "Benderoff, Erin" + }, { "affiliation": "Institute for Biomedical Engineering, ETH and University of Zurich", "name": "Christian, Horea", @@ -355,15 +355,15 @@ { "name": "Erickson, Drew" }, - { - "affiliation": "Child Mind Institute", - "name": "Giavasis, Steven" - }, { "affiliation": "NIMH IRP", "name": "Lee, John A.", "orcid": "0000-0001-5884-4247" }, + { + "affiliation": "Child Mind Institute", + "name": "Giavasis, Steven" + }, { "name": "Correa, Carlos" }, @@ -381,9 +381,6 @@ { "name": "Millman, Jarrod" }, - { - "name": "Lai, Jeff" - }, { "name": "Zhou, Dale" }, @@ -393,6 +390,11 @@ { "name": "Haselgrove, Christian" }, + { + "affiliation": "Holland Bloorview Kids Rehabilitation Hospital", + "name": "Tilley II, Steven", + "orcid": "0000-0003-4853-5082" + }, { "name": "Renfro, Mandy" }, @@ -400,16 +402,16 @@ "affiliation": "The University of Sydney", "name": "Liu, Siqi" }, - { - "affiliation": "Leibniz Institute for Neurobiology", - "name": "Stadler, J\u00f6rg", - "orcid": "0000-0003-4313-129X" - }, { "affiliation": "University of Pennsylvania", "name": "Kahn, Ari E.", "orcid": "0000-0002-2127-0507" }, + { + "affiliation": "Leibniz Institute for Neurobiology", + "name": "Stadler, J\u00f6rg", + "orcid": "0000-0003-4313-129X" + }, { "affiliation": "University College London", "name": "P\u00e9rez-Garc\u00eda, Fernando", @@ -502,31 +504,26 @@ "name": "Perkins, L. Nathan" }, { - "affiliation": "University of Amsterdam", - "name": "Lukas Snoek", - "orcid": "0000-0001-8972-204X" + "name": "Marina, Ana" }, { - "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany", - "name": "Weninger, Leon" + "name": "Mattfeld, Aaron" }, { - "affiliation": "Stanford University", - "name": "Lerma-Usabiaga, Garikoitz", - "orcid": "0000-0001-9800-4816" + "name": "Noel, Maxime" }, { - "name": "Marina, Ana" + "affiliation": "University of Amsterdam", + "name": "Lukas Snoek", + "orcid": "0000-0001-8972-204X" }, { - "name": "Mattfeld, Aaron" + "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany", + "name": "Weninger, Leon" }, { "name": "Matsubara, K" }, - { - "name": "Noel, Maxime" - }, { "name": "Cheung, Brian" }, @@ -573,9 +570,6 @@ { "name": "Weinstein, Alejandro" }, - { - "name": "Tambini, Arielle" - }, { "affiliation": "Duke University", "name": "Broderick, William", @@ -598,6 +592,11 @@ { "name": "Khanuja, Ranjeet" }, + { + "affiliation": "National Institute on Aging, Baltimore, MD, USA", + "name": "Bilgel, Murat", + "orcid": "0000-0001-5042-7422" + }, { "name": "Schlamp, Kai" }, @@ -612,6 +611,9 @@ { "name": "Tarbert, Claire" }, + { + "name": "Tambini, Arielle" + }, { "name": "Nickson, Thomas" }, @@ -636,6 +638,11 @@ { "name": "Flandin, Guillaume" }, + { + "affiliation": "Stanford University", + "name": "Lerma-Usabiaga, Garikoitz", + "orcid": "0000-0001-9800-4816" + }, { "affiliation": "Vrije Universiteit Amsterdam", "name": "Ort, Eduard" @@ -691,15 +698,13 @@ "name": "Mihai, Paul Glad", "orcid": "0000-0001-5715-6442" }, + { + "name": "Lai, Jeff" + }, { "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" - }, - { - "affiliation": "Holland Bloorview Kids Rehabilitation Hospital", - "name": "Tilley II, Steven", - "orcid": "0000-0003-4853-5082" } ], "keywords": [ diff --git a/doc/changelog/1.X.X-changelog b/doc/changelog/1.X.X-changelog index 9ef4474bf1..014c1485d0 100644 --- a/doc/changelog/1.X.X-changelog +++ b/doc/changelog/1.X.X-changelog @@ -1,3 +1,17 @@ +1.2.2 (September 05, 2019) +========================== + +##### [Full changelog](https://github.com/nipy/nipype/milestone/33?closed=1) + + * FIX: Ensure ``loadpkl`` returns a not None value (https://github.com/nipy/nipype/pull/3020) + * FIX: ``loadpkl`` failed when pklz file contained versioning info (https://github.com/nipy/nipype/pull/3017) + * FIX: Update mne.WatershedBEM command line (https://github.com/nipy/nipype/pull/3007) + * FIX: Specify correct stop criterion flag in PETPVC (https://github.com/nipy/nipype/pull/3010) + * ENH: Additional arguments to ANTs N4BiasFieldCorrection (https://github.com/nipy/nipype/pull/3012) + * ENH: Add ``--rescale-intensities`` and name_source to N4BiasFieldCorrection (https://github.com/nipy/nipype/pull/3011) + * ENH: Add index_mask_file input to ImageStats (https://github.com/nipy/nipype/pull/3005) + * MAINT: Add ``python_requires`` to package metadata (https://github.com/nipy/nipype/pull/3006) + 1.2.1 (August 19, 2019) ======================= diff --git a/doc/conf.py b/doc/conf.py index 2a253eb7aa..bdf938a70c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -82,7 +82,7 @@ # The short X.Y version. version = nipype.__version__ # The full version, including alpha/beta/rc tags. -release = "1.2.1" +release = "1.2.2" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/nipype/info.py b/nipype/info.py index 827bc93a12..7c13e94418 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -9,7 +9,7 @@ # nipype version information # Remove -dev for release -__version__ = '1.2.2-dev' +__version__ = '1.2.2' def get_nipype_gitversion(): diff --git a/tools/update_zenodo.py b/tools/update_zenodo.py index 637defad49..163f88084d 100755 --- a/tools/update_zenodo.py +++ b/tools/update_zenodo.py @@ -58,6 +58,7 @@ "Leipzig, Germany.", "name": "Mihai, Paul Glad", "orcid": "0000-0001-5715-6442"}, + {"name": "Lai, Jeff"} ] for entry in missing_entries: