Skip to content

Commit 0289137

Browse files
effigieseffigies
authored
Merge pull request #3336 from nipy/rel/1.6.1
REL: 1.6.1
2 parents 935d209 + 9fd9785 commit 0289137

File tree

15 files changed

+159
-117
lines changed

15 files changed

+159
-117
lines changed

‎.circleci/config.yml

+1-71
Original file line numberDiff line numberDiff line change
@@ -204,61 +204,6 @@ jobs:
204204
- /tmp/docker/cache/Dockerfile.base-pruned
205205
key: dockerfile-cache-v1-{{ .Branch }}-{{ checksum "/tmp/docker/cache/Dockerfile.base-pruned" }}
206206

207-
pypi_precheck:
208-
machine: *machine_kwds
209-
working_directory: /home/circleci/nipype
210-
steps:
211-
- checkout:
212-
path: /home/circleci/nipype
213-
- run:
214-
name: Check pypi preconditions
215-
command: |
216-
pyenv local 3.6.5
217-
pip install --upgrade pip twine future wheel readme_renderer setuptools
218-
python setup.py sdist bdist_wheel
219-
twine check dist/*
220-
- run:
221-
name: Validate Python 3 installation
222-
command: |
223-
pyenv local 3.6.5
224-
pip install --upgrade pip
225-
pip install dist/nipype-*-py3-none-any.whl
226-
- run:
227-
name: Validate Python 3.7 installation
228-
command: |
229-
pyenv local 3.7.0
230-
pip install --upgrade pip
231-
# Pre-install a version of numpy that will not pass
232-
pip install numpy==1.15.0
233-
pip install dist/nipype-*-py3-none-any.whl
234-
# Numpy should be upgraded to >= 1.15.3
235-
test "$(pip show numpy | grep Version)" \> "Version: 1.15.2"
236-
- run:
237-
name: Check python_requires prevents installation on Python 3.3
238-
command: |
239-
pyenv install 3.3.7
240-
pyenv local 3.3.7
241-
FAIL=false
242-
pip install dist/nipype-*-py2.py3-none-any.whl || FAIL=true
243-
$FAIL
244-
- store_artifacts:
245-
path: /home/circleci/nipype/dist
246-
247-
deploy_pypi:
248-
machine: *machine_kwds
249-
working_directory: /home/circleci/nipype
250-
steps:
251-
- checkout:
252-
path: /home/circleci/nipype
253-
- run:
254-
name: Deploy to PyPI
255-
command: |
256-
pyenv local 3.6.5
257-
pip install --upgrade twine wheel readme_renderer setuptools
258-
python setup.py check -r -s
259-
python setup.py sdist bdist_wheel
260-
twine upload dist/*
261-
262207
update_feedstock:
263208
machine: *machine_kwds
264209
working_directory: /home/circleci/nipype
@@ -295,12 +240,6 @@ workflows:
295240
version: 2
296241
build_test_deploy:
297242
jobs:
298-
- pypi_precheck:
299-
filters:
300-
branches:
301-
only: /(rel|dev)\/.*/
302-
tags:
303-
only: /.*/
304243
- compare_base_dockerfiles:
305244
filters:
306245
branches:
@@ -325,19 +264,10 @@ workflows:
325264
only: /.*/
326265
requires:
327266
- test_pytest
328-
- deploy_pypi:
329-
filters:
330-
branches:
331-
ignore: /.*/
332-
tags:
333-
only: /.*/
334-
requires:
335-
- pypi_precheck
336-
- test_pytest
337267
- update_feedstock:
338268
context: nipybot
339269
filters:
340270
branches:
341-
only: /rel\/.*/
271+
only: /rel\/\d.*/
342272
tags:
343273
only: /.*/

‎.github/workflows/package.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Packaging
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- maint/*
8+
- rel/*
9+
tags:
10+
- '*'
11+
12+
defaults:
13+
run:
14+
shell: bash
15+
16+
jobs:
17+
package:
18+
# Build packages and upload
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
include:
23+
- os: ubuntu-latest
24+
python-version: 3.8
25+
steps:
26+
- uses: actions/checkout@v2
27+
- name: Set up Python ${{ matrix.python-version }}
28+
uses: actions/setup-python@v2
29+
with:
30+
python-version: ${{ matrix.python-version }}
31+
- name: Display Python version
32+
run: python -c "import sys; print(sys.version)"
33+
- name: Create virtual environment
34+
run: tools/ci/create_venv.sh
35+
- name: Build sdist
36+
run: tools/ci/build_archive.sh
37+
env:
38+
INSTALL_TYPE: sdist
39+
- name: Build wheel
40+
run: tools/ci/build_archive.sh
41+
env:
42+
INSTALL_TYPE: wheel
43+
### Temporary
44+
- name: Check packages with twine
45+
run: |
46+
pip install twine
47+
twine check dist/*
48+
### Switch back to this if we figure out who has permissions on test.pypi.org
49+
# - name: Test PyPI upload
50+
# uses: pypa/gh-action-pypi-publish@master
51+
# with:
52+
# user: __token__
53+
# password: ${{ secrets.TEST_PYPI_API_TOKEN }}
54+
# repository_url: https://test.pypi.org/legacy/
55+
# skip_existing: true
56+
- name: Upload to PyPI (on tags)
57+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
58+
uses: pypa/gh-action-pypi-publish@master
59+
with:
60+
user: __token__
61+
password: ${{ secrets.PYPI_API_TOKEN }}

‎.mailmap

+7
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ David Mordom <[email protected]>
5555
David Welch <[email protected]> <[email protected]>
5656
Dimitri Papadopoulos Orfanos <[email protected]>
5757
Dmytro Belevtsoff <[email protected]>
58+
Dorian Vogel <[email protected]>
5859
Dylan M. Nielson <[email protected]>
5960
Dylan M. Nielson <[email protected]> <[email protected]>
6061
Eduard Ort <[email protected]>
@@ -73,6 +74,7 @@ Gilles de Hollander <[email protected]>
7374
Gio Piantoni <[email protected]>
7475
Guillaume Flandin <[email protected]>
7576
Hans Johnson <[email protected]> <[email protected]>
77+
Henry Jones <[email protected]>
7678
Horea Christian <[email protected]> <[email protected]>
7779
Hrvoje Stojic <[email protected]>
7880
Isaac Schwabacher <[email protected]>
@@ -153,6 +155,8 @@ Ranjit Khanuja <[email protected]>
153155
Rastko Ćirić <[email protected]>
154156
Rastko Ćirić <[email protected]> <[email protected]>
155157
Rastko Ćirić <[email protected]> <[email protected]>
158+
Raunak Jalan <[email protected]>
159+
Raunak Jalan <[email protected]> <[email protected]>
156160
Ross Markello <[email protected]> <[email protected]>
157161
Russell Poldrack <[email protected]>
158162
Russell Poldrack <[email protected]>
@@ -175,6 +179,9 @@ Steven Giavasis <[email protected]> <[email protected]
175179
Steven Giavasis <[email protected]> <[email protected]>
176180
Steven Tilley <[email protected]> <[email protected]>
177181
Sulantha Mathotaarachchi <[email protected]>
182+
Tim Robert-Fitzgerald <[email protected]>
183+
Tom Close <[email protected]>
184+
Tom Close <[email protected]> <[email protected]>
178185
Tristan Glatard <[email protected]> <[email protected]>
179186
Victor Férat <[email protected]>
180187
Victor Férat <[email protected]> <[email protected]>

‎.zenodo.json

+45-30
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,11 @@
230230
"name": "Mancini, Matteo",
231231
"orcid": "0000-0001-7194-4568"
232232
},
233+
{
234+
"affiliation": "University of Sydney",
235+
"name": "Close, Thomas",
236+
"orcid": "0000-0002-4160-2134"
237+
},
233238
{
234239
"affiliation": "National Institute of Mental Health",
235240
"name": "Nielson, Dylan M.",
@@ -246,15 +251,30 @@
246251
{
247252
"name": "Mordom, David"
248253
},
254+
{
255+
"affiliation": "CIBIT, UC",
256+
"name": "Machado, F\u00e1tima",
257+
"orcid": "0000-0001-8878-1750"
258+
},
249259
{
250260
"affiliation": "ARAMIS LAB, Brain and Spine Institute (ICM), Paris, France.",
251261
"name": "Guillon, Je\u0301re\u0301my",
252262
"orcid": "0000-0002-2672-7510"
253263
},
264+
{
265+
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
266+
"name": "Waller, Lea",
267+
"orcid": "0000-0002-3239-6957"
268+
},
254269
{
255270
"affiliation": "Indiana University, IN, USA",
256271
"name": "Koudoro, Serge"
257272
},
273+
{
274+
"affiliation": "Penn Statistics in Imaging and Visualization Endeavor, University of Pennsylvania",
275+
"name": "Robert-Fitzgerald, Timothy",
276+
"orcid": "0000-0001-8303-8001"
277+
},
258278
{
259279
"affiliation": "Donders Institute for Brain, Cognition and Behavior, Center for Cognitive Neuroimaging",
260280
"name": "Chetverikov, Andrey",
@@ -334,6 +354,11 @@
334354
{
335355
"name": "Schwartz, Yannick"
336356
},
357+
{
358+
"affiliation": "The University of Iowa",
359+
"name": "Ghayoor, Ali",
360+
"orcid": "0000-0002-8858-1254"
361+
},
337362
{
338363
"affiliation": "NIMH IRP",
339364
"name": "Lee, John A.",
@@ -403,13 +428,12 @@
403428
"orcid": "0000-0003-2766-8425"
404429
},
405430
{
406-
"affiliation": "University of Iowa",
407-
"name": "Welch, David"
431+
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
432+
"name": "Baratz, Zvi"
408433
},
409434
{
410-
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
411-
"name": "Waller, Lea",
412-
"orcid": "0000-0002-3239-6957"
435+
"affiliation": "University of Iowa",
436+
"name": "Welch, David"
413437
},
414438
{
415439
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
@@ -421,11 +445,6 @@
421445
"name": "Triplett, William",
422446
"orcid": "0000-0002-9546-1306"
423447
},
424-
{
425-
"affiliation": "The University of Iowa",
426-
"name": "Ghayoor, Ali",
427-
"orcid": "0000-0002-8858-1254"
428-
},
429448
{
430449
"affiliation": "Child Mind Institute",
431450
"name": "Craddock, R. Cameron",
@@ -614,6 +633,9 @@
614633
"name": "Lee, Nat",
615634
"orcid": "0000-0001-9308-9988"
616635
},
636+
{
637+
"name": "Jalan, Raunak"
638+
},
617639
{
618640
"name": "Inati, Souheil"
619641
},
@@ -697,10 +719,6 @@
697719
"name": "Andberg, Sami Kristian",
698720
"orcid": "0000-0002-5650-3964"
699721
},
700-
{
701-
"affiliation": "Sagol School of Neuroscience, Tel Aviv University",
702-
"name": "Baratz, Zvi"
703-
},
704722
{
705723
"name": "Matsubara, K"
706724
},
@@ -711,11 +729,6 @@
711729
{
712730
"name": "Marina, Ana"
713731
},
714-
{
715-
"affiliation": "University of Sydney",
716-
"name": "Close, Thomas",
717-
"orcid": "0000-0002-4160-2134"
718-
},
719732
{
720733
"name": "Davison, Andrew"
721734
},
@@ -741,9 +754,19 @@
741754
{
742755
"name": "Shachnev, Dmitry"
743756
},
757+
{
758+
"affiliation": "University of Applied Sciences and Arts Northwestern Switzerland",
759+
"name": "Vogel, Dorian",
760+
"orcid": "0000-0003-3445-576X"
761+
},
744762
{
745763
"name": "Flandin, Guillaume"
746764
},
765+
{
766+
"affiliation": "Stanford University and the University of Chicago",
767+
"name": "Jones, Henry",
768+
"orcid": "0000-0001-7719-3646"
769+
},
747770
{
748771
"affiliation": "Athinoula A. Martinos Center for Biomedical Imaging, Department of Radiology, Massachusetts General Hospital, Charlestown, MA, USA",
749772
"name": "Gonzalez, Ivan",
@@ -790,22 +813,19 @@
790813
"name": "Broderick, William",
791814
"orcid": "0000-0002-8999-9003"
792815
},
793-
{
794-
"name": "Tambini, Arielle"
795-
},
796816
{
797817
"affiliation": "Weill Cornell Medicine",
798818
"name": "Xie, Xihe",
799819
"orcid": "0000-0001-6595-2473"
800820
},
821+
{
822+
"name": "Tambini, Arielle"
823+
},
801824
{
802825
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany.",
803826
"name": "Mihai, Paul Glad",
804827
"orcid": "0000-0001-5715-6442"
805828
},
806-
{
807-
"name": "Jalan, Raunak",
808-
},
809829
{
810830
"affiliation": "Department of Psychology, Stanford University",
811831
"name": "Gorgolewski, Krzysztof J.",
@@ -815,11 +835,6 @@
815835
"affiliation": "MIT, HMS",
816836
"name": "Ghosh, Satrajit",
817837
"orcid": "0000-0002-5312-6729"
818-
},
819-
{
820-
"affiliation": "CIBIT, UC",
821-
"name": "Machado, Fátima",
822-
"orcid": "0000-0001-8878-1750"
823838
}
824839
],
825840
"keywords": [

0 commit comments

Comments
 (0)