diff --git a/.mailmap b/.mailmap index 79ac75ba46..ca8fe1b171 100644 --- a/.mailmap +++ b/.mailmap @@ -6,8 +6,8 @@ Alejandro Tabas Alejandro de la Vega Alejandro de la Vega Alexander Schaefer -Alexander Schaefer Alexander Schaefer +Alexander Schaefer Alexandre M. Savio Alexandre M. Savio Andrea Dell'Orco @@ -22,9 +22,9 @@ Anna Doll <45283972+AnnaD15@users.noreply.github.com> Ariel Rokem Ariel Rokem Arman Eshaghi +Ashely Gillman Avneet Kaur Avneet Kaur -Ashely Gillman Basille Pinsard Basille Pinsard Ben Cipollini @@ -39,8 +39,8 @@ Blake Dewey Brendan Moloney Caroline Froehlich Christopher J. Markiewicz -Christopher J. Markiewicz Christopher J. Markiewicz +Christopher J. Markiewicz Christopher John Steele Cindee Madison Colin Buchanan @@ -49,8 +49,8 @@ Colin Buchanan Daniel Brenner Daniel Clark Daniel Geisler -Daniel Geisler Daniel Geisler <3453485+daniel-ge@users.noreply.github.com> +Daniel Geisler Daniel Ginsburg Daniel McNamee David Ellis @@ -89,17 +89,17 @@ Hrvoje Stojic Isaac Schwabacher Jakub Kaczmarzyk James Kent -James Kent James Kent +James Kent Janosch Linkersdörfer Jason Wong Jason Wong Jens Kleesiek Jessica Forbes Jérémy Guillon +Joerg Stadler Joerg Stadler Joerg Stadler -Joerg Stadler John A. Lee John A. Lee Joke Durnez @@ -116,30 +116,28 @@ Kesshi Jordan Kevin Sitek Kevin Sitek -Sin Kim -Sin Kim Koen Helwegen Kornelius Podranski Kristofer Montazeri Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski -Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski Krzysztof J. Gorgolewski +Krzysztof J. Gorgolewski Kshitij Chawla Leonie Lampe Lukas Snoek Marcel Falkiewicz Maria de Fatima Dias Maria de Fatima Dias -Martin Perez-Guevara Martin Norgaard +Martin Perez-Guevara Mathias Goncalves Mathias Goncalves -Mathieu Dubois Mathieu Dubois +Mathieu Dubois Matteo Mancini Matteo Visconti di Oleggio Castello Matteo Visconti di Oleggio Castello @@ -147,8 +145,8 @@ Matthew Cieslak Michael Clark Michael Dayan Michael Dayan -Michael Dayan mick-d Michael Dayan +Michael Dayan mick-d Michael Joseph Michael Joseph Michael Philipp Notter @@ -171,8 +169,8 @@ Paul Kuntke Paul Sharp Ranjit Khanuja Rastko Ćirić -Rastko Ćirić Rastko Ćirić +Rastko Ćirić Raunak Jalan Raunak Jalan <41023976+RaunakJalan@users.noreply.github.com> Ross Markello @@ -186,15 +184,17 @@ Serge Koudoro Sharad Sikka Shariq Iqbal Shariq Iqbal -Shoshana Berleant Shoshana Berleant Shoshana Berleant +Shoshana Berleant Shoshana Berleant Shoshana Berleant Ubuntu Simon Rothmei Simon Rothmei +Sin Kim +Sin Kim Siqi Liu Steven Giavasis -Steven Giavasis Steven Giavasis +Steven Giavasis Steven Tilley Sulantha Mathotaarachchi Sunjae Shim <85246533+sjshim@users.noreply.github.com> diff --git a/.zenodo.json b/.zenodo.json index 4e8b3022a2..0703ffa351 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -318,6 +318,11 @@ "name": "Bernardoni, Fabio", "orcid": "0000-0002-5112-405X" }, + { + "affiliation": "Sagol School of Neuroscience, Tel Aviv University", + "name": "Ben-Zvi, Gal", + "orcid": "0000-0002-5655-9423" + }, { "affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China; Max Planck Institute for Psycholinguistics, Nijmegen, the Netherlands", "name": "Kong, Xiang-Zhen", @@ -456,11 +461,6 @@ "affiliation": "University of Iowa", "name": "Welch, David" }, - { - "affiliation": "Sagol School of Neuroscience, Tel Aviv University", - "name": "Ben-Zvi, Gal", - "orcid": "0000-0002-5655-9423" - }, { "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences", "name": "Contier, Oliver", @@ -892,7 +892,11 @@ "orcid": "0000-0002-5312-6729" } ], - "keywords": ["neuroimaging", "workflow", "pipeline"], + "keywords": [ + "neuroimaging", + "workflow", + "pipeline" + ], "license": "Apache-2.0", "upload_type": "software" } diff --git a/doc/changelog/1.X.X-changelog.rst b/doc/changelog/1.X.X-changelog.rst index 922d06db6f..433212f4ce 100644 --- a/doc/changelog/1.X.X-changelog.rst +++ b/doc/changelog/1.X.X-changelog.rst @@ -1,3 +1,14 @@ +1.8.4 (September 01, 2022) +========================== + +Bug-fix release in the 1.8.x series. + +This release sets a maximum traits version to avoid new, breaking changes. + + * MNT: Pin traits < 6.4 (https://github.com/nipy/nipype/pull/3501) + * ENH: Add inputs to mrtrix3.DWIPreprocInputSpec and remove mandatory annotation for pe_dir (https://github.com/nipy/nipype/pull/3470) + + 1.8.3 (July 14, 2022) ===================== diff --git a/nipype/info.py b/nipype/info.py index bfc4e2f841..49c29f4a65 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -5,7 +5,7 @@ # nipype version information # Remove .dev0 for release -__version__ = "1.8.4.dev0" +__version__ = "1.8.4" def get_nipype_gitversion(): @@ -171,6 +171,7 @@ def get_nipype_gitversion(): "sphinxcontrib-apidoc", ], "duecredit": ["duecredit"], + "maint": ["GitPython", "fuzzywuzzy"], "nipy": ["nitime", "nilearn", "dipy", "nipy", "matplotlib"], "profiler": ["psutil>=5.0"], "pybids": ["pybids>=0.7.0"], diff --git a/tools/update_changes.sh b/tools/update_changes.sh index b5f5f8c0a4..c3b20df5cd 100755 --- a/tools/update_changes.sh +++ b/tools/update_changes.sh @@ -25,7 +25,8 @@ echo $HEADER >> newchanges echo $( printf "%${#HEADER}s" | tr " " "=" ) >> newchanges echo >> newchanges -if [[ "x$2" != "x" ]]; then +MILESTONE=${2:-""} +if [[ "x$MILESTONE" != "x" ]]; then echo "(\`Full changelog \`__)" >> newchanges echo >> newchanges fi diff --git a/tools/update_mailmap.sh b/tools/update_mailmap.sh new file mode 100644 index 0000000000..4602e85e3a --- /dev/null +++ b/tools/update_mailmap.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# usage -> bash update_mailmap.sh +# by default, will use the latest tag + +set -ux + +ROOT=$( git rev-parse --show-toplevel ) +MAILMAP=$ROOT/.mailmap + +LAST=$(git describe --tags `git rev-list --tags --max-count=1`) +RELEASE=${1:-$LAST} + +IFS=$'\n' +for NAME in $(git shortlog -nse $RELEASE.. | cut -f2-); do + echo $NAME +done + +# sort and write +sort $MAILMAP > .tmpmailmap +cp .tmpmailmap $MAILMAP +rm .tmpmailmap