From 56ff8c325c38a44b72f102957f955b2dd94b1a93 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Sun, 26 Jan 2020 18:38:51 -0500 Subject: [PATCH 1/2] MNT: Prep for 1.4.1 --- .mailmap | 4 +- .zenodo.json | 182 +++++++++++++++--------------- doc/changelog/1.X.X-changelog.rst | 5 +- doc/interfaces.rst | 2 +- nipype/info.py | 2 +- 5 files changed, 100 insertions(+), 95 deletions(-) diff --git a/.mailmap b/.mailmap index b96d00f538..31867022f1 100644 --- a/.mailmap +++ b/.mailmap @@ -24,6 +24,7 @@ Basille Pinsard Ben Cipollini Benjamin Acland Benjamin Meyers <34044274+BenjaminMey@users.noreply.github.com> +Benjamin Meyers <34044274+BenjaminMey@users.noreply.github.com> BenjaminMey Benjamin Yvernault Benjamin Yvernault Blake Dewey @@ -96,7 +97,8 @@ Kesshi Jordan Kevin Sitek Kevin Sitek -Kim, Sin +Sin Kim +Sin Kim Kornelius Podranski Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski diff --git a/.zenodo.json b/.zenodo.json index 57605f0503..3a2c1f0eaa 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -10,9 +10,6 @@ "name": "Markiewicz, Christopher J.", "orcid": "0000-0002-6533-164X" }, - { - "name": "Burns, Christopher" - }, { "affiliation": "University of Iowa", "name": "Johnson, Hans", @@ -33,14 +30,14 @@ "name": "Jarecka, Dorota", "orcid": "0000-0001-8282-2988" }, + { + "name": "Burns, Christopher" + }, { "affiliation": "The University of Iowa", "name": "Ellis, David Gage", "orcid": "0000-0002-3718-6836" }, - { - "name": "Yvernault, Benjamin" - }, { "name": "Hamalainen, Carlo", "orcid": "0000-0001-7655-3830" @@ -50,6 +47,9 @@ "name": "Notter, Michael Philipp", "orcid": "0000-0002-5866-047X" }, + { + "name": "Yvernault, Benjamin" + }, { "affiliation": "Florida International University", "name": "Salo, Taylor", @@ -81,6 +81,10 @@ { "name": "Madison, Cindee" }, + { + "affiliation": "Concordia University", + "name": "Benderoff, Erin" + }, { "affiliation": "Developer", "name": "Clark, Daniel", @@ -94,11 +98,6 @@ "name": "Clark, Dav", "orcid": "0000-0002-3982-4416" }, - { - "affiliation": "National Institute of Mental Health", - "name": "Nielson, Dylan M.", - "orcid": "0000-0003-4613-6643" - }, { "affiliation": "UC Berkeley - UCSF Graduate Program in Bioengineering", "name": "Keshavan, Anisha", @@ -109,6 +108,11 @@ "name": "Joseph, Michael", "orcid": "0000-0002-0068-230X" }, + { + "affiliation": "National Institute of Mental Health", + "name": "Nielson, Dylan M.", + "orcid": "0000-0003-4613-6643" + }, { "affiliation": "Mayo Clinic, Neurology, Rochester, MN, USA", "name": "Dayan, Michael", @@ -117,19 +121,14 @@ { "name": "Modat, Marc" }, - { - "affiliation": "Molecular Imaging Research Center, CEA, France", - "name": "Bougacha, Salma" - }, { "affiliation": "CNRS LTCI, Telecom ParisTech, Universit\u00e9 Paris-Saclay", "name": "Gramfort, Alexandre", "orcid": "0000-0001-9791-4404" }, { - "affiliation": "Dartmouth College", - "name": "Visconti di Oleggio Castello, Matteo", - "orcid": "0000-0001-7931-5272" + "affiliation": "Molecular Imaging Research Center, CEA, France", + "name": "Bougacha, Salma" }, { "name": "Pinsard, Basile" @@ -147,6 +146,11 @@ "name": "Rokem, Ariel", "orcid": "0000-0003-0679-1985" }, + { + "affiliation": "Dartmouth College", + "name": "Visconti di Oleggio Castello, Matteo", + "orcid": "0000-0001-7931-5272" + }, { "affiliation": "Dartmouth College: Hanover, NH, United States", "name": "Halchenko, Yaroslav O.", @@ -158,19 +162,15 @@ "orcid": "0000-0002-5544-7577" }, { - "affiliation": "Concordia University", - "name": "Benderoff, Erin" + "affiliation": "INRIA", + "name": "Varoquaux, Gael", + "orcid": "0000-0003-1076-5122" }, { "affiliation": "Stanford University", "name": "\u0106iri\u0107 , Rastko", "orcid": "0000-0001-6347-7939" }, - { - "affiliation": "INRIA", - "name": "Varoquaux, Gael", - "orcid": "0000-0003-1076-5122" - }, { "name": "Moloney, Brendan" }, @@ -187,16 +187,16 @@ "affiliation": "National Institutes of Health", "name": "Clark, Michael G. " }, - { - "affiliation": "Athena EPI, Inria Sophia-Antipolis", - "name": "Wassermann, Demian", - "orcid": "0000-0001-5194-6056" - }, { "affiliation": "UC San Diego", "name": "Cipollini, Ben", "orcid": "0000-0002-7782-0790" }, + { + "affiliation": "Athena EPI, Inria Sophia-Antipolis", + "name": "Wassermann, Demian", + "orcid": "0000-0001-5194-6056" + }, { "affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.", "name": "Guillon, Je\u0301re\u0301my", @@ -207,20 +207,16 @@ "name": "Markello, Ross", "orcid": "0000-0003-1057-1336" }, - { - "name": "Buchanan, Colin" - }, { "affiliation": "Otto-von-Guericke-University Magdeburg, Germany", "name": "Hanke, Michael", "orcid": "0000-0001-6398-6370" }, { - "name": "Tungaraza, Rosalia" + "name": "Buchanan, Colin" }, { - "affiliation": "Nathan s Kline institute for psychiatric research", - "name": "Sikka, Sharad" + "name": "Tungaraza, Rosalia" }, { "affiliation": "Australian eHealth Research Centre, Commonwealth Scientific and Industrial Research Organisation; University of Queensland", @@ -237,17 +233,21 @@ "name": "de Hollander, Gilles", "orcid": "0000-0003-1988-5091" }, + { + "affiliation": "Nathan s Kline institute for psychiatric research", + "name": "Sikka, Sharad" + }, { "name": "Forbes, Jessica" }, + { + "name": "Mordom, David" + }, { "affiliation": "Duke University", "name": "Iqbal, Shariq", "orcid": "0000-0003-2766-8425" }, - { - "name": "Mordom, David" - }, { "affiliation": "University College London", "name": "Mancini, Matteo", @@ -305,14 +305,14 @@ "name": "Eshaghi, Arman", "orcid": "0000-0002-6652-3512" }, + { + "name": "Ginsburg, Daniel" + }, { "affiliation": "National University Singapore", "name": "Schaefer, Alexander", "orcid": "0000-0001-6488-4739" }, - { - "name": "Ginsburg, Daniel" - }, { "affiliation": "Florida International University", "name": "Bottenhorn, Katherine", @@ -345,17 +345,12 @@ { "name": "Erickson, Drew" }, - { - "affiliation": "Child Mind Institute", - "name": "Giavasis, Steven" - }, { "name": "Ghayoor, Ali" }, { - "affiliation": "University of Zurich", - "name": "Liem, Franz", - "orcid": "0000-0003-0646-4810" + "affiliation": "Child Mind Institute", + "name": "Giavasis, Steven" }, { "affiliation": "University of Texas at Austin", @@ -363,10 +358,12 @@ "orcid": "0000-0001-9062-3778" }, { - "name": "K\u00fcttner, Ren\u00e9" + "affiliation": "University of Zurich", + "name": "Liem, Franz", + "orcid": "0000-0003-0646-4810" }, { - "name": "Millman, Jarrod" + "name": "K\u00fcttner, Ren\u00e9" }, { "affiliation": "Neurospin/Unicog/Inserm/CEA", @@ -378,6 +375,12 @@ "name": "Lee, John A.", "orcid": "0000-0001-5884-4247" }, + { + "name": "Millman, Jarrod" + }, + { + "name": "Lai, Jeff" + }, { "name": "Zhou, Dale" }, @@ -411,6 +414,11 @@ { "name": "Hallquist, Michael" }, + { + "affiliation": "Korea Advanced Institute of Science and Technology", + "name": "Kim, Sin", + "orcid": "0000-0003-4652-3758" + }, { "affiliation": "University of Pennsylvania", "name": "Kahn, Ari E.", @@ -447,6 +455,11 @@ { "name": "Park, Anne" }, + { + "affiliation": "Max Planck UCL Centre for Computational Psychiatry and Ageing Research, University College London", + "name": "Stojic, Hrvoje", + "orcid": "0000-0002-9699-9052" + }, { "affiliation": "Child Mind Institute", "name": "Craddock, R. Cameron", @@ -463,9 +476,9 @@ "name": "Perkins, L. Nathan" }, { - "affiliation": "Korea Advanced Institute of Science and Technology", - "name": "Kim, Sin", - "orcid": "0000-0003-4652-3758" + "affiliation": "University of Amsterdam", + "name": "Snoek, Lukas", + "orcid": "0000-0001-8972-204X" }, { "affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging", @@ -475,21 +488,11 @@ { "name": "Inati, Souheil" }, - { - "affiliation": "Department of Neuropsychiatry, University of Pennsylvania", - "name": "Cieslak, Matthew", - "orcid": "0000-0002-1931-4734" - }, { "affiliation": "GIGA Institute", "name": "Grignard, Martin", "orcid": "0000-0001-5549-1861" }, - { - "affiliation": "University of Amsterdam", - "name": "Snoek, Lukas", - "orcid": "0000-0001-8972-204X" - }, { "affiliation": "Yale University; New Haven, CT, United States", "name": "Sisk, Lucinda M.", @@ -505,9 +508,6 @@ "name": "Junhao WEN", "orcid": "0000-0003-2077-3070" }, - { - "name": "Matsubara, K" - }, { "name": "Urchs, Sebastian" }, @@ -515,9 +515,7 @@ "name": "Blair, Ross" }, { - "affiliation": "Max Planck UCL Centre for Computational Psychiatry and Ageing Research, University College London", - "name": "Stojic, Hrvoje", - "orcid": "0000-0002-9699-9052" + "name": "Matsubara, K" }, { "affiliation": "The University of Texas at Austin", @@ -532,6 +530,11 @@ "name": "Gerhard, Stephan", "orcid": "0000-0003-4454-6171" }, + { + "affiliation": "Leibniz Institute for Neurobiology", + "name": "Stadler, J\u00f6rg", + "orcid": "0000-0003-4313-129X" + }, { "affiliation": "University of Newcastle, Australia", "name": "Cooper, Gavin", @@ -540,9 +543,6 @@ { "name": "Haehn, Daniel" }, - { - "name": "Tambini, Arielle" - }, { "affiliation": "Duke University", "name": "Broderick, William", @@ -556,16 +556,16 @@ { "name": "Noel, Maxime" }, + { + "affiliation": "Department of Neuropsychiatry, University of Pennsylvania", + "name": "Cieslak, Matthew", + "orcid": "0000-0002-1931-4734" + }, { "affiliation": "Department of Psychology, Stanford University; Parietal, INRIA", "name": "Durnez, Joke", "orcid": "0000-0001-9030-2202" }, - { - "affiliation": "Leibniz Institute for Neurobiology", - "name": "Stadler, J\u00f6rg", - "orcid": "0000-0003-4313-129X" - }, { "affiliation": "CNRS, UMS3552 IRMaGe", "name": "Condamine, Eric", @@ -581,6 +581,14 @@ "name": "Geisler, Daniel", "orcid": "0000-0003-2076-5329" }, + { + "affiliation": "University of Pittsburgh", + "name": "Meyers, Benjamin", + "orcid": "0000-0001-9137-4363" + }, + { + "name": "Tambini, Arielle" + }, { "name": "Weinstein, Alejandro" }, @@ -612,6 +620,10 @@ { "name": "Falkiewicz, Marcel" }, + { + "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany", + "name": "Weninger, Leon" + }, { "name": "Podranski, Kornelius" }, @@ -628,20 +640,12 @@ "name": "Lerma-Usabiaga, Garikoitz", "orcid": "0000-0001-9800-4816" }, - { - "name": "Shachnev, Dmitry" - }, { "name": "Tarbert, Claire" }, { "name": "Cheung, Brian" }, - { - "affiliation": "University of Pittsburgh", - "name": "Meyers, Benjamin", - "orcid": "0000-0001-9137-4363" - }, { "affiliation": "Washington University in St Louis", "name": "Van, Andrew", @@ -651,8 +655,7 @@ "name": "Davison, Andrew" }, { - "affiliation": "Institute of Imaging & Computer Vision, RWTH Aachen University, Germany", - "name": "Weninger, Leon" + "name": "Shachnev, Dmitry" }, { "affiliation": "Technical University Munich", @@ -679,9 +682,6 @@ "name": "McNamee, Daniel", "orcid": "0000-0001-9928-4960" }, - { - "name": "Lai, Jeff" - }, { "name": "Arias, Jaime" }, diff --git a/doc/changelog/1.X.X-changelog.rst b/doc/changelog/1.X.X-changelog.rst index 4e9c1a6521..1da7da60cb 100644 --- a/doc/changelog/1.X.X-changelog.rst +++ b/doc/changelog/1.X.X-changelog.rst @@ -1,7 +1,9 @@ -1.4.1 (To Be Determined) +1.4.1 (January 27, 2020) ======================== (`Full changelog `__) + * FIX: DataSink to S3 buckets (https://github.com/nipy/nipype/pull/3130) + * FIX: improve version checking for nodes of workflows (https://github.com/nipy/nipype/pull/3152) * FIX: mapnode to generate result file when crashes in single node mode (https://github.com/nipy/nipype/pull/3143) * FIX: Can't seem to import workflows from niflows in CircleCI (https://github.com/nipy/nipype/pull/3134) * FIX: Repair aftermath of docs refactor (https://github.com/nipy/nipype/pull/3133) @@ -11,6 +13,7 @@ * DOC: Documentation overhaul (https://github.com/nipy/nipype/pull/3124) * DOC: Deep revision of documentation building (https://github.com/nipy/nipype/pull/3120) * DOC: Deduplicate code for Sphinx's APIdoc generation (https://github.com/nipy/nipype/pull/3119) + * MNT: Update requirements.txt post-1.4 (https://github.com/nipy/nipype/pull/3153) 1.4.0 (December 20, 2019) ========================= diff --git a/doc/interfaces.rst b/doc/interfaces.rst index 32aabf7d0b..bcfe31040a 100644 --- a/doc/interfaces.rst +++ b/doc/interfaces.rst @@ -8,7 +8,7 @@ Interfaces and Workflows :Release: |version| :Date: |today| -Previous versions: `1.3.0 `_ `1.2.3 `_ +Previous versions: `1.4.0 `_ `1.3.2 `_ Workflows --------- diff --git a/nipype/info.py b/nipype/info.py index 7980f3719b..829a4ccdb4 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -5,7 +5,7 @@ # nipype version information # Remove -dev for release -__version__ = "1.4.1-dev" +__version__ = "1.4.1" def get_nipype_gitversion(): From 70cafbc59dee439e6de1dc062113abb007794617 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Sun, 26 Jan 2020 18:57:00 -0500 Subject: [PATCH 2/2] MNT: Update abelalez mailmap, add to Zenodo --- .mailmap | 1 + .zenodo.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index 31867022f1..ab924a2e42 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,4 @@ +Abel A. González Orozco Aimi Watanabe Aimi Watanabe stymy Alejandro Tabas diff --git a/.zenodo.json b/.zenodo.json index 3a2c1f0eaa..b8f2c4fb67 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -592,6 +592,10 @@ { "name": "Weinstein, Alejandro" }, + { + "affiliation": "Universidad de Guadalajara", + "name": "Gonz\u00e1lez Orozco, Abel A." + }, { "name": "Harms, Robbert" },