Skip to content

Commit 10d5ccf

Browse files
authoredSep 21, 2022
Merge pull request #3511 from nipy/rel/1.8.5
REL: 1.8.5
2 parents e28e556 + c3d6672 commit 10d5ccf

File tree

5 files changed

+51
-28
lines changed

5 files changed

+51
-28
lines changed
 

‎.github/workflows/tutorials.yml

+18-12
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,55 @@ jobs:
1313
tutorial:
1414
runs-on: ubuntu-latest
1515
env:
16-
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
16+
BRANCH_NAME: ${{ github.ref_name }}
1717
steps:
1818
- name: Start time
1919
id: start
2020
run: echo "::set-output name=start_time::$(date +'%Y-%m-%dT%H:%M:%S%z')"
2121
- name: Trigger Nipype tutorial Github Action
2222
run: |
23+
set -x
2324
curl -X POST \
2425
-H "Authorization: Bearer ${{ secrets.TUTORIAL_ACCESS_TOKEN }}" \
2526
-H "Accept: application/vnd.github+json" \
2627
https://api.github.com/repos/miykael/nipype_tutorial/actions/workflows/testing.yml/dispatches \
27-
-d '{"nipype_branch": "'${BRANCH_NAME:4}'"}'
28+
-d '{"ref": "master", "inputs": {"nipype_branch": "'${BRANCH_NAME}'"}}'
29+
sleep 10
2830
- name: Check Action was successfully dispatched
2931
id: dispatched
3032
run: |
31-
RUN_ID=$(curl -X POST \
32-
-H "Accept: application/vnd.github+json" \
33-
"https://api.github.com/repos/miykael/nipype_tutorial/actions/runs?created=>${{ steps.start.outputs.start_time }}&per_page=1" \
33+
set -x
34+
START=${{ steps.start.outputs.start_time }}
35+
RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
36+
'https://api.github.com/repos/miykael/nipype_tutorial/actions/runs?created=>'${START}'&per_page=1' \
3437
| jq -r '.workflow_runs[0].id')
3538
3639
# fail if not extracted
3740
[[ -n $RUN_ID ]] || exit 1
38-
echo "::set-output name=run_id::$RUN_ID""
41+
echo "::set-output name=run_id::$RUN_ID"
3942
- name: Check if action completed
40-
timeout-minutes: 60
43+
timeout-minutes: 120
4144
run: |
45+
set -x
46+
RUN_ID=${{ steps.dispatched.outputs.run_id }}
4247
while :
4348
do
4449
TIMESTAMP=$(date +'%Y-%m-%dT%H:%M:%S%z')
4550
# check status every 5 minutes
4651
STATUS=$(curl -H "Accept: application/vnd.github+json" \
47-
"https://api.github.com/repos/miykael/nipype_tutorial/actions/runs/${{ steps.dispatched.outputs.run_id }}" \
52+
https://api.github.com/repos/miykael/nipype_tutorial/actions/runs/${RUN_ID} \
4853
| jq -r '.conclusion')
4954
case $STATUS in
5055
success)
51-
echo "[$TIMESTAMP] Tutorial run ${{ steps.dispatched.outputs.run_id }} completed successfully."
56+
echo "[$TIMESTAMP] Tutorial run $RUN_ID completed successfully."
5257
exit 0
53-
;;
58+
;;
5459
failure)
55-
echo "[$TIMESTAMP] Tutorial run ${{ steps.dispatched.outputs.run_id }} failed."
60+
echo "[$TIMESTAMP] Tutorial run $RUN_ID failed."
5661
exit 1
57-
;;
62+
;;
5863
*)
5964
echo "[$TIMESTAMP] Conclusion ($STATUS) is not yet complete"
6065
sleep 300
66+
esac
6167
done

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ David Ellis <dgellis90@gmail.com> <david.ellis@unmc.edu>
5858
David Mordom <moreno@cbs.mpg.de>
5959
David Welch <david.m.welch@gmail.com> <dmwelch@users.noreply.github.com>
6060
Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr>
61+
Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> <3234522+DimitriPapadopoulos@users.noreply.github.com>
6162
Dmytro Belevtsoff <belevtsoff@gmail.com>
6263
Dorian Vogel <dorianvogel@gmail.com>
6364
Dylan M. Nielson <adenosine@gmail.com>

‎.zenodo.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@
9494
"name": "Salo, Taylor",
9595
"orcid": "0000-0001-9813-3167"
9696
},
97-
{
98-
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
99-
"name": "Dewey, Blake E",
100-
"orcid": "0000-0003-4554-5058"
101-
},
10297
{
10398
"affiliation": "University of Iowa",
10499
"name": "Johnson, Hans",
105100
"orcid": "0000-0001-9513-2660"
106101
},
102+
{
103+
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
104+
"name": "Dewey, Blake E",
105+
"orcid": "0000-0003-4554-5058"
106+
},
107107
{
108108
"affiliation": "Molecular Imaging Research Center, CEA, France",
109109
"name": "Bougacha, Salma"
@@ -300,6 +300,11 @@
300300
"name": "Acland, Benjamin",
301301
"orcid": "0000-0001-6392-6634"
302302
},
303+
{
304+
"affiliation": "Division of Psychological and Social Medicine and Developmental Neuroscience, Faculty of Medicine, Technische Universität Dresden, Dresden, Germany",
305+
"name": "Bernardoni, Fabio",
306+
"orcid": "0000-0002-5112-405X"
307+
},
303308
{
304309
"name": "Forbes, Jessica"
305310
},
@@ -313,11 +318,6 @@
313318
"name": "Gillman, Ashley",
314319
"orcid": "0000-0001-9130-1092"
315320
},
316-
{
317-
"affiliation": "Division of Psychological and Social Medicine and Developmental Neuroscience, Faculty of Medicine, Technische Universität Dresden, Dresden, Germany",
318-
"name": "Bernardoni, Fabio",
319-
"orcid": "0000-0002-5112-405X"
320-
},
321321
{
322322
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
323323
"name": "Ben-Zvi, Gal",
@@ -414,6 +414,11 @@
414414
{
415415
"name": "Haselgrove, Christian"
416416
},
417+
{
418+
"affiliation": "CEA",
419+
"name": "Papadopoulos Orfanos, Dimitri",
420+
"orcid": "0000-0002-1242-8990"
421+
},
417422
{
418423
"affiliation": "Department of Psychology, Stanford University; Parietal, INRIA",
419424
"name": "Durnez, Joke",
@@ -479,11 +484,6 @@
479484
{
480485
"name": "Correa, Carlos"
481486
},
482-
{
483-
"affiliation": "CEA",
484-
"name": "Papadopoulos Orfanos, Dimitri",
485-
"orcid": "0000-0002-1242-8990"
486-
},
487487
{
488488
"affiliation": "Leibniz Institute for Neurobiology",
489489
"name": "Stadler, Jörg",

‎doc/changelog/1.X.X-changelog.rst

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
1.8.5 (September 21, 2022)
2+
==========================
3+
4+
Bug-fix release in the 1.8.x series.
5+
6+
* FIX: Use interpolation/method in numpy.percentile as available (https://github.com/nipy/nipype/pull/3506)
7+
* FIX: Deployed Matlab applications must not call addpath() (https://github.com/nipy/nipype/pull/3509)
8+
* FIX: Provide more runtime information when node execution fails (https://github.com/nipy/nipype/pull/3505)
9+
* FIX: Fixed bug for work dirs longer than 255 characters, fixes #2061 (https://github.com/nipy/nipype/pull/3495)
10+
* FIX: Update ApplyVDM to handle 4D inputs (https://github.com/nipy/nipype/pull/3500)
11+
* ENH: Explicitly specify write_text encoding format (https://github.com/nipy/nipype/pull/3508)
12+
* DOC: Fix typos found by copdespell (https://github.com/nipy/nipype/pull/3510)
13+
* MAINT: Add github action to trigger tutorials for release branches (https://github.com/nipy/nipype/pull/3504)
14+
* CI: Set up build-test-deploy workflow on GHA (https://github.com/nipy/nipype/pull/3513)
15+
16+
117
1.8.4 (September 01, 2022)
218
==========================
319

‎nipype/info.py

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

66
# nipype version information
77
# Remove .dev0 for release
8-
__version__ = "1.8.5.dev0"
8+
__version__ = "1.8.5"
99

1010

1111
def get_nipype_gitversion():

0 commit comments

Comments
 (0)