Skip to content

Commit f8f7fb5

Browse files
effigieseffigies
authored
Merge pull request #3446 from nipy/rel/1.7.1
REL: 1.7.1
2 parents 4ac2189 + b7c3df0 commit f8f7fb5

File tree

7 files changed

+97
-58
lines changed

7 files changed

+97
-58
lines changed

Diff for: ‎.circleci/config.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ jobs:
213213
- run:
214214
name: Install hub
215215
command: |
216-
curl -sSL https://github.com/github/hub/releases/download/v2.2.9/hub-linux-amd64-2.2.9.tgz | \
216+
curl -sSL https://github.com/github/hub/releases/download/v2.14.2/hub-linux-amd64-2.14.2.tgz | \
217217
tar zxv -C /tmp
218-
sudo /tmp/hub-linux-amd64-2.2.9/install
218+
sudo /tmp/hub-linux-amd64-2.14.2/install
219219
- run:
220220
name: Expand SSH Key
221221
command: |
@@ -225,10 +225,11 @@ jobs:
225225
chmod go-rwx ~/.ssh/id_ed25519
226226
ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub
227227
- run:
228-
name: Set git identity
228+
name: Set git/hub configuration
229229
command: |
230230
git config --global user.name "nipybot"
231231
git config --global user.email "[email protected]"
232+
git config --global hub.protocol ssh
232233
- run:
233234
name: Update feedstock
234235
command: |

Diff for: ‎.mailmap

+7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Alexander Schaefer <[email protected]> <aschaefer@aschaefer-U36SD.(none)>
1111
Alexandre M. Savio <[email protected]>
1212
Alexandre M. Savio <[email protected]> <[email protected]>
1313
Andrea Dell'Orco <[email protected]>
14+
Andrea Dell'Orco <[email protected]> <[email protected]>
1415
Andrew Floren <[email protected]>
1516
Andrey Chetverikov <[email protected]>
1617
Andrey Chetverikov <[email protected]> <[email protected]>
@@ -64,6 +65,8 @@ Elizabeth DuPre <[email protected]>
6465
Erik Ziegler <[email protected]>
6566
Erik Ziegler <[email protected]> <[email protected]>
6667
Erik Ziegler <[email protected]> <erik@erik-ubuntu.(none)>
68+
Fabio Bernardoni <[email protected]>
69+
Fabio Bernardoni <[email protected]> <[email protected]>
6770
Feilong Ma <[email protected]>
6871
Fernando Pérez-García <[email protected]>
6972
Franz Liem <[email protected]>
@@ -109,6 +112,7 @@ Kevin Sitek <[email protected]>
109112
Kevin Sitek <[email protected]> <[email protected]>
110113
Sin Kim <[email protected]>
111114
Sin Kim <[email protected]> <[email protected]>
115+
Koen Helwegen <[email protected]>
112116
Kornelius Podranski <[email protected]>
113117
Krzysztof J. Gorgolewski <[email protected]>
114118
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
@@ -121,6 +125,7 @@ Kshitij Chawla <[email protected]>
121125
Leonie Lampe <[email protected]>
122126
Lukas Snoek <[email protected]>
123127
Marcel Falkiewicz <[email protected]> <[email protected]>
128+
Maria de Fatima Dias <[email protected]>
124129
Maria de Fatima Dias <[email protected]> <[email protected]>
125130
Martin Perez-Guevara <[email protected]>
126131
Mathias Goncalves <[email protected]> <[email protected]>
@@ -153,6 +158,8 @@ Oscar Esteban <[email protected]>
153158
Oscar Esteban <[email protected]> <code@oscaresteban>
154159
Pablo Polosecki <[email protected]> <[email protected]>
155160
Pablo Polosecki <[email protected]> <[email protected]>
161+
Paul Kuntke <[email protected]>
162+
Paul Kuntke <[email protected]> <[email protected]>
156163
Paul Sharp <[email protected]>
157164
Ranjit Khanuja <[email protected]>
158165
Rastko Ćirić <[email protected]>

Diff for: ‎.zenodo.json

+45-46
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@
178178
{
179179
"name": "Erickson, Drew"
180180
},
181+
{
182+
"affiliation": "CIBIT, UC",
183+
"name": "Dias, Maria de Fatima",
184+
"orcid": "0000-0001-8878-1750"
185+
},
181186
{
182187
"affiliation": "Neuroscience Program, University of Iowa",
183188
"name": "Kent, James D.",
@@ -203,6 +208,11 @@
203208
{
204209
"name": "Tungaraza, Rosalia"
205210
},
211+
{
212+
"affiliation": "Charit\u00e8 Universit\u00e4tsmedizin Berlin, Germany",
213+
"name": "Dell'Orco, Andrea",
214+
"orcid": "0000-0002-3964-8360"
215+
},
206216
{
207217
"affiliation": "Child Mind Institute",
208218
"name": "Frohlich, Caroline"
@@ -218,9 +228,8 @@
218228
"orcid": "0000-0003-1988-5091"
219229
},
220230
{
221-
"affiliation": "Charit\u00e8 Universit\u00e4tsmedizin Berlin, Germany",
222-
"name": "Dell'Orco, Andrea",
223-
"orcid": "0000-0002-3964-8360"
231+
"affiliation": "Indiana University, IN, USA",
232+
"name": "Koudoro, Serge"
224233
},
225234
{
226235
"affiliation": "University College London",
@@ -250,31 +259,22 @@
250259
"name": "Varoquaux, Gael",
251260
"orcid": "0000-0003-1076-5122"
252261
},
253-
{
254-
"name": "Watanabe, Aimi"
255-
},
256-
{
257-
"name": "Mordom, David"
258-
},
259262
{
260263
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
261264
"name": "Waller, Lea",
262265
"orcid": "0000-0002-3239-6957"
263266
},
264267
{
265-
"affiliation": "CIBIT, UC",
266-
"name": "Dias, Maria de Fatima",
267-
"orcid": "0000-0001-8878-1750"
268+
"name": "Watanabe, Aimi"
269+
},
270+
{
271+
"name": "Mordom, David"
268272
},
269273
{
270274
"affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
271275
"name": "Guillon, Je\u0301re\u0301my",
272276
"orcid": "0000-0002-2672-7510"
273277
},
274-
{
275-
"affiliation": "Indiana University, IN, USA",
276-
"name": "Koudoro, Serge"
277-
},
278278
{
279279
"affiliation": "Penn Statistics in Imaging and Visualization Endeavor, University of Pennsylvania",
280280
"name": "Robert-Fitzgerald, Timothy",
@@ -308,6 +308,11 @@
308308
"name": "Gillman, Ashley",
309309
"orcid": "0000-0001-9130-1092"
310310
},
311+
{
312+
"affiliation": "Division of Psychological and Social Medicine and Developmental Neuroscience, Faculty of Medicine, Technische Universit\u00e4t Dresden, Dresden, Germany",
313+
"name": "Bernardoni, Fabio",
314+
"orcid": "0000-0002-5112-405X"
315+
},
311316
{
312317
"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",
313318
"name": "Kong, Xiang-Zhen",
@@ -318,11 +323,6 @@
318323
"name": "Geisler, Daniel",
319324
"orcid": "0000-0003-2076-5329"
320325
},
321-
{
322-
"affiliation": "Division of Psychological and Social Medicine and Developmental Neuroscience, Faculty of Medicine, Technische Universit\u00e4t Dresden, Dresden, Germany",
323-
"name": "Bernardoni, Fabio",
324-
"orcid": "0000-0002-5112-405X"
325-
},
326326
{
327327
"name": "Salvatore, John"
328328
},
@@ -416,6 +416,11 @@
416416
"name": "Glatard, Tristan",
417417
"orcid": "0000-0003-2620-5883"
418418
},
419+
{
420+
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
421+
"name": "Baratz, Zvi",
422+
"orcid": "0000-0001-7159-1387"
423+
},
419424
{
420425
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
421426
"name": "Tabas, Alejandro",
@@ -437,11 +442,6 @@
437442
"name": "Iqbal, Shariq",
438443
"orcid": "0000-0003-2766-8425"
439444
},
440-
{
441-
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
442-
"name": "Baratz, Zvi",
443-
"orcid": "0000-0001-7159-1387"
444-
},
445445
{
446446
"affiliation": "University of Iowa",
447447
"name": "Welch, David"
@@ -547,6 +547,9 @@
547547
"name": "Stojic, Hrvoje",
548548
"orcid": "0000-0002-9699-9052"
549549
},
550+
{
551+
"name": "Hui Qian, Tan"
552+
},
550553
{
551554
"affiliation": "German Institute for International Educational Research",
552555
"name": "Linkersd\u00f6rfer, Janosch",
@@ -570,6 +573,11 @@
570573
"name": "Pauli, Wolfgang M.",
571574
"orcid": "0000-0002-0966-0254"
572575
},
576+
{
577+
"affiliation": "Weill Cornell Medicine",
578+
"name": "Xie, Xihe",
579+
"orcid": "0000-0001-6595-2473"
580+
},
573581
{
574582
"affiliation": "NIMH, Scientific and Statistical Computing Core",
575583
"name": "Glen, Daniel",
@@ -644,6 +652,11 @@
644652
"name": "Lee, Nat",
645653
"orcid": "0000-0001-9308-9988"
646654
},
655+
{
656+
"affiliation": "Insitiute and Polyclinc for Diagnostic and Interventional Neuroradiology, University Hospital Carl Gustav Carus, Dresden, Germany",
657+
"name": "Kuntke, Paul",
658+
"orcid": "0000-0003-1838-2230"
659+
},
647660
{
648661
"name": "Jalan, Raunak"
649662
},
@@ -722,6 +735,11 @@
722735
{
723736
"name": "Modat, Marc"
724737
},
738+
{
739+
"affiliation": "University of Waterloo",
740+
"name": "Mukhometzianov, Rinat",
741+
"orcid": "0000-0003-1274-4827"
742+
},
725743
{
726744
"name": "Harms, Robbert"
727745
},
@@ -818,11 +836,6 @@
818836
{
819837
"name": "Khanuja, Ranjeet"
820838
},
821-
{
822-
"affiliation": "University of Waterloo",
823-
"name": "Mukhometzianov, Rinat",
824-
"orcid": "0000-0003-1274-4827"
825-
},
826839
{
827840
"name": "Urchs, Sebastian"
828841
},
@@ -839,11 +852,6 @@
839852
"name": "Broderick, William",
840853
"orcid": "0000-0002-8999-9003"
841854
},
842-
{
843-
"affiliation": "Weill Cornell Medicine",
844-
"name": "Xie, Xihe",
845-
"orcid": "0000-0001-6595-2473"
846-
},
847855
{
848856
"name": "Tambini, Arielle"
849857
},
@@ -861,16 +869,7 @@
861869
"affiliation": "MIT, HMS",
862870
"name": "Ghosh, Satrajit",
863871
"orcid": "0000-0002-5312-6729"
864-
},
865-
{
866-
"name": "Hui Qian, Tan"
867-
},
868-
{
869-
"affiliation": "Insitiute and Polyclinc for Diagnostic and Interventional Neuroradiology, University Hospital Carl Gustav Carus, Dresden, Germany",
870-
"name": "Kuntke, Paul",
871-
"orcid": "0000-0003-1838-2230"
872-
}
873-
872+
}
874873
],
875874
"keywords": [
876875
"neuroimaging",

Diff for: ‎doc/changelog/1.X.X-changelog.rst

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
1.7.1 (April 05, 2022)
2+
======================
3+
4+
(`Full changelog <https://github.com/nipy/nipype/milestone/1.7.1?closed=1>`__)
5+
6+
* FIX: Allow ``ConvertScalarImageToRGBInputSpec.mask_file`` to be ``"none"`` (https://github.com/nipy/nipype/pull/3364)
7+
* FIX: Use a more robust strategy for detecting ANTs version (https://github.com/nipy/nipype/pull/3444)
8+
* FIX: Retry renaming pkl(z) files on failure (https://github.com/nipy/nipype/pull/3404)
9+
* FIX: Escape metacharacters when parsing dcm2niix outputs (https://github.com/nipy/nipype/pull/3417)
10+
* FIX: Import error for nipype.interfaces.dipy.base (https://github.com/nipy/nipype/pull/3414)
11+
* FIX: ``ValueError`` when using ``ResourceMonitor`` (https://github.com/nipy/nipype/pull/3419)
12+
* FIX: Improve error handling of ``CommandLine`` interfaces (https://github.com/nipy/nipype/pull/3395)
13+
* FIX: Bugs in ApplyVDM interface (https://github.com/nipy/nipype/pull/3396)
14+
* ENH: Add MRTrix3 interfaces (pared-down gh-3426) (https://github.com/nipy/nipype/pull/3445)
15+
* ENH: Enable BidsDataGrabber to load saved layouts (https://github.com/nipy/nipype/pull/3421)
16+
* ENH: ROBEX interface (https://github.com/nipy/nipype/pull/3443)
17+
* ENH: Include several operations to ANTs's ImageMath interface, including ReplicateImage and ReplicateDisplacement (https://github.com/nipy/nipype/pull/3435)
18+
* ENH: Add "GenericLabel" to antsRegistration interpolation option. (https://github.com/nipy/nipype/pull/3424)
19+
* ENH: added Apply VDM functionality to FieldMap SPM interface (https://github.com/nipy/nipype/pull/3394)
20+
* DOC: Side bar and main page fixes (https://github.com/nipy/nipype/pull/3397)
21+
* TEST: Allow SVD columns to flip sign (https://github.com/nipy/nipype/pull/3405)
22+
* MNT: rename dipy ``move_streamlines`` to ``transform_tracking_output`` (https://github.com/nipy/nipype/pull/3412)
23+
* MNT: Test on Python 3.10 (https://github.com/nipy/nipype/pull/3438)
24+
* MNT: Added ORCID iD (https://github.com/nipy/nipype/pull/3436)
25+
26+
127
1.7.0 (October 20, 2021)
228
========================
329

Diff for: ‎doc/users/install.rst

+10-4
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,17 @@ use the following command::
5050
While `all` installs everything, one can also install select components as
5151
listed below::
5252

53-
'doc': ['Sphinx>=1.4', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
54-
'tests': ['pytest-cov', 'codecov'],
55-
'nipy': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
56-
'profiler': ['psutil'],
53+
'data': ['datalad'],
54+
'doc': ['dipy', 'ipython', 'matplotlib', 'nbsphinx', 'sphinx-argparse',
55+
'sphinx>=2.1.2', 'sphinxcontrib-apidoc'],
5756
'duecredit': ['duecredit'],
57+
'nipy': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
58+
'profiler': ['psutil>=5.0'],
59+
'pybids': ['pybids>=0.7.0'],
60+
'specs': ['black'],
61+
'ssh': ['paramiko'],
62+
'tests': ['codecov', 'coverage<5', 'pytest', 'pytest-cov', 'pytest-env',
63+
'pytest-timeout'],
5864
'xvfbwrapper': ['xvfbwrapper'],
5965

6066

Diff for: ‎nipype/info.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# nipype version information
77
# Remove -dev for release
8-
__version__ = "1.7.1-dev"
8+
__version__ = "1.7.1"
99

1010

1111
def get_nipype_gitversion():

Diff for: ‎tools/feedstock.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#
2626
# 2018 Chris Markiewicz
2727

28-
set -x
28+
set -ex
2929

3030
REPO=${1:-$CIRCLE_PROJECT_REPONAME}
3131
FEEDSTOCK=${2:-$REPO-feedstock}
@@ -62,7 +62,7 @@ if git checkout -t $GITHUB_USER/$BRANCH; then
6262
NEW_PR=false
6363
else
6464
NEW_PR=true
65-
git checkout -b $BRANCH origin/master
65+
git checkout -b $BRANCH origin/main
6666
fi
6767

6868
# Calculate hash
@@ -77,7 +77,7 @@ fi
7777

7878
# Set version, hash, and reset build number
7979
# Use ~ for separator in URL, to avoid slash issues
80-
sed -i '' \
80+
sed -i \
8181
-e 's/^\({% set version = "\).*\(" %}\)$/'"\1$VERSION\2/" \
8282
-e 's/^\({% set sha256 = "\).*\(" %}\)$/'"\1$SHA256\2/" \
8383
-e 's~^\( *url:\) .*$~\1 '"$URL_FMT~" \
@@ -90,7 +90,7 @@ git commit -m "$COMMIT_MSG"
9090
git push -u $GITHUB_USER $BRANCH
9191

9292
if $NEW_PR; then
93-
hub pull-request -b conda-forge:master -F - <<END
93+
hub pull-request -b conda-forge:main -F - <<END
9494
$PR_TITLE
9595
9696
Updating feedstock to release branch

0 commit comments

Comments
 (0)