Skip to content

REL: 1.8.4 #3503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Alejandro Tabas <[email protected]> <[email protected]>
Alejandro de la Vega <[email protected]>
Alejandro de la Vega <[email protected]> <[email protected]>
Alexander Schaefer <[email protected]>
Alexander Schaefer <[email protected]> <[email protected]>
Alexander Schaefer <[email protected]> <aschaefer@aschaefer-U36SD.(none)>
Alexander Schaefer <[email protected]> <[email protected]>
Alexandre M. Savio <[email protected]>
Alexandre M. Savio <[email protected]> <[email protected]>
Andrea Dell'Orco <[email protected]>
Expand All @@ -22,9 +22,9 @@ Anna Doll <[email protected]>
Ariel Rokem <[email protected]>
Ariel Rokem <[email protected]> <[email protected]>
Arman Eshaghi <[email protected]>
Ashely Gillman <[email protected]> <[email protected]>
Avneet Kaur <[email protected]>
Avneet Kaur <[email protected]> <[email protected]>
Ashely Gillman <[email protected]> <[email protected]>
Basille Pinsard <[email protected]>
Basille Pinsard <[email protected]> <[email protected]>
Ben Cipollini <[email protected]> <[email protected]>
Expand All @@ -39,8 +39,8 @@ Blake Dewey <[email protected]> <[email protected]>
Brendan Moloney <[email protected]>
Caroline Froehlich <[email protected]>
Christopher J. Markiewicz <[email protected]>
Christopher J. Markiewicz <[email protected]> <[email protected]>
Christopher J. Markiewicz <[email protected]> <[email protected]>
Christopher J. Markiewicz <[email protected]> <[email protected]>
Christopher John Steele <[email protected]>
Cindee Madison <[email protected]>
Colin Buchanan <[email protected]>
Expand All @@ -49,8 +49,8 @@ Colin Buchanan <[email protected]> <[email protected]>
Daniel Brenner <[email protected]>
Daniel Clark <[email protected]>
Daniel Geisler <[email protected]>
Daniel Geisler <[email protected]> <[email protected]>
Daniel Geisler <[email protected]> <[email protected]>
Daniel Geisler <[email protected]> <[email protected]>
Daniel Ginsburg <[email protected]>
Daniel McNamee <[email protected]>
David Ellis <[email protected]> <[email protected]>
Expand Down Expand Up @@ -89,17 +89,17 @@ Hrvoje Stojic <[email protected]>
Isaac Schwabacher <[email protected]>
Jakub Kaczmarzyk <[email protected]>
James Kent <[email protected]>
James Kent <[email protected]> <[email protected]>
James Kent <[email protected]> <[email protected]>
James Kent <[email protected]> <[email protected]>
Janosch Linkersdörfer <[email protected]>
Jason Wong <[email protected]>
Jason Wong <[email protected]> <[email protected]>
Jens Kleesiek <[email protected]>
Jessica Forbes <[email protected]>
Jérémy Guillon <[email protected]> <[email protected]>
Joerg Stadler <[email protected]> <[email protected]>
Joerg Stadler <[email protected]> <[email protected]>
Joerg Stadler <[email protected]> <[email protected]>
Joerg Stadler <[email protected]> <[email protected]>
John A. Lee <[email protected]>
John A. Lee <[email protected]> <[email protected]>
Joke Durnez <[email protected]>
Expand All @@ -116,39 +116,37 @@ Kesshi Jordan <[email protected]> <[email protected]
Kesshi Jordan <[email protected]> <[email protected]>
Kevin Sitek <[email protected]>
Kevin Sitek <[email protected]> <[email protected]>
Sin Kim <[email protected]>
Sin Kim <[email protected]> <[email protected]>
Koen Helwegen <[email protected]>
Kornelius Podranski <[email protected]>
Kristofer Montazeri <[email protected]>
Krzysztof J. Gorgolewski <[email protected]>
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500.(none)>
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-dtc-laptop>
Krzysztof J. Gorgolewski <[email protected]> <filo@filolaptop>
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
Kshitij Chawla <[email protected]>
Leonie Lampe <[email protected]>
Lukas Snoek <[email protected]>
Marcel Falkiewicz <[email protected]> <[email protected]>
Maria de Fatima Dias <[email protected]>
Maria de Fatima Dias <[email protected]> <[email protected]>
Martin Perez-Guevara <[email protected]>
Martin Norgaard <[email protected]>
Martin Perez-Guevara <[email protected]>
Mathias Goncalves <[email protected]> <[email protected]>
Mathias Goncalves <[email protected]> <[email protected]>
Mathieu Dubois <[email protected]> <[email protected]>
Mathieu Dubois <[email protected]> <[email protected]>
Mathieu Dubois <[email protected]> <[email protected]>
Matteo Mancini <[email protected]>
Matteo Visconti di Oleggio Castello <[email protected]>
Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
Matthew Cieslak <[email protected]>
Michael Clark <[email protected]> <[email protected]>
Michael Dayan <[email protected]>
Michael Dayan <[email protected]> <[email protected]>
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
Michael Dayan <[email protected]> <[email protected]>
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
Michael Joseph <[email protected]>
Michael Joseph <[email protected]> <[email protected]>
Michael Philipp Notter <[email protected]>
Expand All @@ -171,8 +169,8 @@ Paul Kuntke <[email protected]> <[email protected]>
Paul Sharp <[email protected]>
Ranjit Khanuja <[email protected]>
Rastko Ćirić <[email protected]>
Rastko Ćirić <[email protected]> <[email protected]>
Rastko Ćirić <[email protected]> <[email protected]>
Rastko Ćirić <[email protected]> <[email protected]>
Raunak Jalan <[email protected]>
Raunak Jalan <[email protected]> <[email protected]>
Ross Markello <[email protected]> <[email protected]>
Expand All @@ -186,15 +184,17 @@ Serge Koudoro <[email protected]>
Sharad Sikka <[email protected]>
Shariq Iqbal <[email protected]>
Shariq Iqbal <[email protected]> <[email protected]>
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
Shoshana Berleant <[email protected]> <[email protected]>
Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
Simon Rothmei <[email protected]>
Simon Rothmei <[email protected]> <[email protected]>
Sin Kim <[email protected]>
Sin Kim <[email protected]> <[email protected]>
Siqi Liu <[email protected]>
Steven Giavasis <[email protected]>
Steven Giavasis <[email protected]> <[email protected]>
Steven Giavasis <[email protected]> <[email protected]>
Steven Giavasis <[email protected]> <[email protected]>
Steven Tilley <[email protected]> <[email protected]>
Sulantha Mathotaarachchi <[email protected]>
Sunjae Shim <[email protected]>
Expand Down
16 changes: 10 additions & 6 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -892,7 +892,11 @@
"orcid": "0000-0002-5312-6729"
}
],
"keywords": ["neuroimaging", "workflow", "pipeline"],
"keywords": [
"neuroimaging",
"workflow",
"pipeline"
],
"license": "Apache-2.0",
"upload_type": "software"
}
11 changes: 11 additions & 0 deletions doc/changelog/1.X.X-changelog.rst
Original file line number Diff line number Diff line change
@@ -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)
=====================

Expand Down
3 changes: 2 additions & 1 deletion nipype/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# nipype version information
# Remove .dev0 for release
__version__ = "1.8.4.dev0"
__version__ = "1.8.4"


def get_nipype_gitversion():
Expand Down Expand Up @@ -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"],
Expand Down
3 changes: 2 additions & 1 deletion tools/update_changes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/nipy/nipype/milestone/$2?closed=1>\`__)" >> newchanges
echo >> newchanges
fi
Expand Down
22 changes: 22 additions & 0 deletions tools/update_mailmap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

# usage -> bash update_mailmap.sh <previous-release>
# 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