Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

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
mgxd merged 7 commits into master from rel/1.8.4
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
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Alejandro Tabas <alextabas@gmail.com> <qtabas@gmail.com>
Alejandro de la Vega <aleph4@gmail.com>
Alejandro de la Vega <aleph4@gmail.com> <delavega@utexas.edu>
Alexander Schaefer <alexschaefer83@gmail.com>
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@aschaefer-U36SD.(none)>
Alexander Schaefer <alexschaefer83@gmail.com> <aschaefer@melisse.cbs.mpg.de>
Alexandre M. Savio <alexsavio@gmail.com>
Alexandre M. Savio <alexsavio@gmail.com> <alexsavio@users.noreply.github.com>
Andrea Dell'Orco <orco@paranoici.org>
Expand All @@ -22,9 +22,9 @@ Anna Doll <45283972+AnnaD15@users.noreply.github.com>
Ariel Rokem <arokem@berkeley.edu>
Ariel Rokem <arokem@berkeley.edu> <arokem@gmail.com>
Arman Eshaghi <arman.eshaghi@gmail.com>
Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk>
Avneet Kaur <avneetkaur@bohr.neurobio.nru.dk> <avneet14027@iiitd.ac.in>
Ashely Gillman <gillmanash@gmail.com> <ashley.gillman@csiro.au>
Basille Pinsard <basile.pinsard@umontreal.ca>
Basille Pinsard <basile.pinsard@umontreal.ca> <bpinsard@imed.jussieu.fr>
Ben Cipollini <bcipollini@classy.org> <bcipolli@ucsd.edu>
Expand All @@ -39,8 +39,8 @@ Blake Dewey <blake.dewey@jhu.edu> <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
Brendan Moloney <moloney.brendan@gmail.com>
Caroline Froehlich <carol.frohlich@gmail.com>
Christopher J. Markiewicz <effigies@gmail.com>
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
Christopher J. Markiewicz <effigies@gmail.com> <effigies@bu.edu>
Christopher J. Markiewicz <effigies@gmail.com> <markiewicz@stanford.edu>
Christopher John Steele <steelec@gmail.com>
Cindee Madison <cindee@berkeley.edu>
Colin Buchanan <colinrbuchanan@gmail.com>
Expand All @@ -49,8 +49,8 @@ Colin Buchanan <colinrbuchanan@gmail.com> <mankind@MacBook.local>
Daniel Brenner <daniel.brenner@me.com>
Daniel Clark <danieljclark87@gmail.com>
Daniel Geisler <daniel.geisler@gmail.com>
Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
Daniel Geisler <daniel.geisler@gmail.com> <3453485+daniel-ge@users.noreply.github.com>
Daniel Geisler <daniel.geisler@gmail.com> <daniel.geisler@uniklinikum-dresden.de>
Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu>
Daniel McNamee <dmcx88@gmail.com>
David Ellis <dgellis90@gmail.com> <david-ellis@uiowa.edu>
Expand Down Expand Up @@ -89,17 +89,17 @@ Hrvoje Stojic <hrvoje.stojic@protonmail.com>
Isaac Schwabacher <ischwabacher@wisc.edu>
Jakub Kaczmarzyk <jakubk@mit.edu>
James Kent <james-kent@uiowa.edu>
James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
James Kent <james-kent@uiowa.edu> <jamesdkent21@gmail.com>
James Kent <james-kent@uiowa.edu> <mertzf@bargle.argle>
Janosch Linkersdörfer <linkersdoerfer@gmail.com>
Jason Wong <jf126dolphin@gmail.com>
Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
Jens Kleesiek <kleesiek@uni-heidelberg.de>
Jessica Forbes <jessica-forbes@uiowa.edu>
Jérémy Guillon <jeremy.guillon@inria.fr> <jeremy.guillon@etu.upmc.fr>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
John A. Lee <johnleenimh@gmail.com>
John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
Joke Durnez <joke.durnez@gmail.com>
Expand All @@ -116,39 +116,37 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kesshijordan@iPhone-010060104098.ucsf.ed
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> <kjordan@codd.radiology.ucsf.edu>
Kevin Sitek <ksitek@mit.edu>
Kevin Sitek <ksitek@mit.edu> <sitek.kevin@gmail.com>
Sin Kim <kimsin98@gmail.com>
Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
Koen Helwegen <kg.helwegen@gmail.com>
Kornelius Podranski <kilo13@web.de>
Kristofer Montazeri <kristofer.montazeri@gmail.com>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <chris.gorgolewski@gmail.com>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500.(none)>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-Precision-M6500>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filo-dtc-laptop>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <filo@filolaptop>
Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <krzysztof.gorgolewski+fake@gmail.com>
Kshitij Chawla <kc.insight.pi@gmail.com>
Leonie Lampe <leonie.lampe@gmail.com>
Lukas Snoek <lukassnoek@gmail.com>
Marcel Falkiewicz <mfalkiewicz@gmail.com> <m.falkiewicz@nencki.gov.pl>
Maria de Fatima Dias <mfatimamachado13@gmail.com>
Maria de Fatima Dias <mfatimamachado13@gmail.com> <fmachado@dei.uc.pt>
Martin Perez-Guevara <mperezguevara@gmail.com>
Martin Norgaard <martin.noergaard@nru.dk>
Martin Perez-Guevara <mperezguevara@gmail.com>
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@stanford.edu>
Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
Mathieu Dubois <mathieu.dubois@icm-institute.org> <duboismathieu_gaas@yahoo.fr>
Mathieu Dubois <mathieu.dubois@icm-institute.org> <mathieu.dubois@cea.fr>
Matteo Mancini <ingmatteomancini@gmail.com>
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu>
Matteo Visconti di Oleggio Castello <matteo.visconti.gr@dartmouth.edu> <mvdoc.gr@dartmouth.edu>
Matthew Cieslak <mattcieslak@gmail.com>
Michael Clark <michael.clark195@gmail.com> <clarkmg@nih.gov>
Michael Dayan <mdayan.research@gmail.com>
Michael Dayan <mdayan.research@gmail.com> <mdayan.comp@gmail.com>
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
Michael Dayan <mdayan.research@gmail.com> <michael@mail.example.com>
Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
Michael Joseph <josephmje.22@gmail.com>
Michael Joseph <josephmje.22@gmail.com> <mjoseph@scclogin02.camhres.ca>
Michael Philipp Notter <michaelnotter@hotmail.com>
Expand All @@ -171,8 +169,8 @@ Paul Kuntke <paul@42degreesoffreedom.com> <paul@kuntke.de>
Paul Sharp <psharp1289@gmail.com>
Ranjit Khanuja <ranjit.jhu@gmail.com>
Rastko Ćirić <rc042010@mymail.pomona.edu>
Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
Rastko Ćirić <rc042010@mymail.pomona.edu> <rastko@stanford.edu>
Rastko Ćirić <rc042010@mymail.pomona.edu> <rciric@users.noreply.github.com>
Raunak Jalan <ronakjalan98@gmail.com>
Raunak Jalan <ronakjalan98@gmail.com> <41023976+RaunakJalan@users.noreply.github.com>
Ross Markello <rossmarkello@gmail.com> <rdm222@cornell.edu>
Expand All @@ -186,15 +184,17 @@ Serge Koudoro <skab12@gmail.com>
Sharad Sikka <ssikka25@gmail.com>
Shariq Iqbal <shariqiqbal2810@gmail.com>
Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
Simon Rothmei <srothmei@mailbox.tu-berlin.de>
Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
Sin Kim <kimsin98@gmail.com>
Sin Kim <kimsin98@gmail.com> <AKSoo@users.noreply.github.com>
Siqi Liu <lsqshr@gmail.com>
Steven Giavasis <sgiava77@gmail.com>
Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
Steven Giavasis <sgiava77@gmail.com> <sgiavasis@ieee.org>
Steven Giavasis <sgiava77@gmail.com> <steven.giavasis@cmi-rsch-li001.childmind.org>
Steven Tilley <stilley@hollandbloorview.ca> <steve@steventilley.com>
Sulantha Mathotaarachchi <sulantha.s@gmail.com>
Sunjae Shim <85246533+sjshim@users.noreply.github.com>
Expand Down
16 changes: 10 additions & 6 deletions .zenodo.json
View file Open in desktop
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
View file Open in desktop
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
View file Open in desktop
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
View file Open in desktop
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 [[ "x2ドル" != "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
View file Open in desktop
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

AltStyle によって変換されたページ (->オリジナル) /