Skip to content

Commit 6b6d816

Browse files
committed
Merge branch 'master' into fix/prov
* master: (1016 commits) RF: Use runtime.cwd in Rename Add gitter and slack channels Update link to mailing list Update links to user and developer help forums CI: Install nipy dependencies when installing AFNI/FSL from NeuroDebian CI: Remove non-working Circle filters CI: Attempt again to ignore travis branches CI: Separate matrix for 3.4 CI: Ignore branches, not tags CI: Move tests to Xenial CI: Do not run Circle tests on Travis-focused branches [skip ci] Install Release Drafter CI: Try Python 3.7 matrix entry CI: Test 3.7-dev, remove fmri extra from Travis MAINT: Bump version to 1.1.3-dev REL: 1.1.2 CI: Only run PyPI pre-checks on rel/* and tags DOC: Update changelog FIX: Pybids grabbids API is going away importing InputMultiObject ...
2 parents a0fa93d + 37f3781 commit 6b6d816

File tree

1,432 files changed

+90819
-71827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,432 files changed

+90819
-71827
lines changed

.circleci/config.yml

Lines changed: 363 additions & 96 deletions
Large diffs are not rendered by default.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e NIPYPE_NUMBER_OF_CPUS=4 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py27" /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline

.circleci/test_py2_pytest.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py27" /usr/bin/run_pytests.sh

.circleci/test_py3_docs.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /src/nipype/doc "${DOCKER_IMAGE}:py36" /usr/bin/run_builddocs.sh
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_fsl_feeds Linear /data/examples/ l1pipeline
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_fsl_reuse Linear /data/examples/ level1_workflow
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_dartel MultiProc /data/examples/ level1
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_dartel MultiProc /data/examples/ l2pipeline
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh test_spm Linear /data/examples/ workflow3d
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh test_spm Linear /data/examples/ workflow4d
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e NIPYPE_NUMBER_OF_CPUS=4 "${DOCKER_IMAGE}:py36" /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ level1

.circleci/test_py3_pytest.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
docker run --rm=false -t -v $WORKDIR:/work -v $HOME/examples:/data/examples:ro -w /work -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 "${DOCKER_IMAGE}:py36" /usr/bin/run_pytests.sh

.circleci/tests.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Vagrantfile
3434
.mailmap
3535

3636
# Previous coverage results
37-
.coverage
37+
.coverage

.github/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ Please put URL to code or code here (if not too long).
1212

1313
### Platform details:
1414

15-
Please paste the output of: `python -c "import nipype; print(nipype.get_info()); print(nipype.__version__)"`
15+
<!-- Please run the following code from your shell and place the output between the triple ticks, below.
16+
python -c "import nipype; from pprint import pprint; pprint(nipype.get_info())"
17+
-->
18+
19+
```
20+
21+
```
1622

1723
### Execution environment
1824

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
Pull-request guidelines (Remove this section after reading):
1+
<!--
2+
3+
Pull-request guidelines
4+
-----------------------
25
36
1. If you would like to list yourself as a Nipype contributor and your name is not mentioned please modify .zenodo.json file.
47
2. By submitting this request you acknowledge that your contributions are available under the Apache 2 license.
58
3. Use a descriptive prefix for your PR: ENH (enhancement), FIX, TST, DOC, STY, REF (refactor), WIP (Work in progress)
6-
4. The person who accepts/merges your PR will include an update to the CHANGES file: prefix: description (URL of pull request)
7-
5. Run `make check-before-commit` before submitting the PR.
9+
4. Run `make check-before-commit` before submitting the PR.
810
9-
----- REMOVE TILL HERE -----
11+
-->
12+
## Summary
13+
<!-- Please reference any related issue and use fixes/close to automatically
14+
close them, if pertinent -->
1015

1116
Fixes # .
1217

13-
Changes proposed in this pull request
14-
-
15-
-
18+
## List of changes proposed in this PR (pull-request)
19+
<!-- We suggest using bullets (indicated by * or -) and filled checkboxes [x] here -->
20+
21+
## Acknowledgment
22+
23+
- [ ] \(Mandatory\) I acknowledge that this contribution will be available under the Apache 2 license.

.github/release-drafter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
template: |
2+
## What's Changed
3+
4+
$CHANGES

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
.DS_Store
2020
nipype/testing/data/von-ray_errmap.nii.gz
2121
nipype/testing/data/von_errmap.nii.gz
22+
nipype/testing/data/.proc*
2223
crash*.pklz
2324
.coverage
2425
htmlcov/
@@ -27,3 +28,4 @@ __pycache__/
2728
.*.swp
2829
.ipynb_checkpoints/
2930
.ruby-version
31+
.pytest_cache

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Aimi Watanabe <[email protected]> stymy <[email protected]>
22
Aimi Watanabe <[email protected]> stymy <[email protected]>
3+
Alejandro de la Vega <[email protected]> adelavega <[email protected]>
34
Alexander Schaefer <[email protected]> Alexander Schaefer <[email protected]>
45
Alexander Schaefer <[email protected]> alexschaefer83 <[email protected]>
56
Alexander Schaefer <[email protected]> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -13,6 +14,7 @@ Ariel Rokem <[email protected]> arokem <[email protected]>
1314
Arman Eshaghi <[email protected]> armaneshaghi <[email protected]>
1415
Ashely Gillman <[email protected]> Ashley Gillman <[email protected]>
1516
Ashely Gillman <[email protected]> ashgillman <[email protected]>
17+
Andrey Chetverikov <[email protected]> achetverikov <[email protected]>
1618
Basille Pinsard <[email protected]> bpinsard <[email protected]>
1719
Basille Pinsard <[email protected]> bpinsard <[email protected]>
1820
Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
@@ -56,11 +58,13 @@ Franz Liem <[email protected]> fliem <franz.liem>
5658
Gael Varoquaux <[email protected]> GaelVaroquaux
5759
Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]>
5860
Gavin Cooper <[email protected]> gjcooper <[email protected]>
61+
Gilles de Hollander <[email protected]> Gilles86 <[email protected]>
5962
Hans Johnson <[email protected]> Hans Johnson <[email protected]>
6063
Hans Johnson <[email protected]> hjmjohnson <[email protected]>
6164
Horea Christian <[email protected]> Horea Christian <[email protected]>
6265
Isaac Schwabacher <[email protected]> ischwabacher <[email protected]>
6366
67+
Jakub Kaczmarzyk <[email protected]> kaczmarj <[email protected]>
6468
6569
6670
Jason Wong <[email protected]> Jason W <[email protected]>
@@ -72,8 +76,12 @@ Joerg Stadler <[email protected]> Jörg Stadler <Stadler@lin-magdeb
7276
Joke Durnez <[email protected]> jokedurnez <[email protected]>
7377
Josh Warner <[email protected]> Josh Warner (Mac) <[email protected]>
7478
Kai Schlamp <[email protected]> medihack <[email protected]>Jessica Forbes <[email protected]> jessicaforbes <[email protected]>
79+
7580
Leonie Lampe <[email protected]> Leonie Lmape <[email protected]>
81+
Lukas Snoek <[email protected]> Lukas Snoek <[email protected]>
7682
Mathias Goncalves <[email protected]> mathiasg <[email protected]>
83+
Matteo Mancini <[email protected]> matteomancini <[email protected]>
84+
Matteo Visconti dOC <[email protected]> mvdoc <[email protected]>
7785
Michael Dayan <[email protected]> Michael <[email protected]>
7886
Michael Dayan <[email protected]> Michael <[email protected]>
7987
Michael Dayan <[email protected]> mick-d <mid2021@CHUCK.(none)>
@@ -102,5 +110,6 @@ Steven Giavasis <[email protected]> sgiavasis <[email protected]>
102110
Tristan Glatard <[email protected]> Tristan Glatard <[email protected]>
103111
Victor Saase <[email protected]> vsaase <[email protected]>
104112
William Triplett <[email protected]> William Triplett <[email protected]>
113+
Wolfgang Pauli <[email protected]> Wolfgang Pauli <[email protected]>
105114
Yaroslav Halchenko <[email protected]> Yaroslav Halchenko <[email protected]>
106115

.travis.yml

Lines changed: 88 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,100 @@
1-
cache:
2-
apt: true
1+
dist: xenial
2+
sudo: true
33

44
language: python
5+
# our build matrix
56
python:
67
- 2.7
7-
- 3.4
88
- 3.5
99
- 3.6
10+
- 3.7
11+
12+
# NOTE: Any changes to the matrix section should be duplicated below for
13+
# Python 3.4
1014
env:
11-
- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler" CI_SKIP_TEST=1
12-
- INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler" CI_SKIP_TEST=1
13-
- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit" CI_SKIP_TEST=1
14-
- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler" PIP_FLAGS="--pre" CI_SKIP_TEST=1
15+
global:
16+
- EXTRA_WHEELS="https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com"
17+
- PRE_WHEELS="https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
18+
- EXTRA_PIP_FLAGS="--find-links=$EXTRA_WHEELS"
19+
matrix:
20+
- INSTALL_DEB_DEPENDECIES=true
21+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
22+
CI_SKIP_TEST=1
23+
- INSTALL_DEB_DEPENDECIES=false
24+
NIPYPE_EXTRAS="doc,tests,profiler"
25+
CI_SKIP_TEST=1
26+
- INSTALL_DEB_DEPENDECIES=true
27+
NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
28+
CI_SKIP_TEST=1
29+
- INSTALL_DEB_DEPENDECIES=true
30+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
31+
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
32+
CI_SKIP_TEST=1
33+
34+
# Python 3.4 is only available on Trusty, so we need to duplicate the
35+
# env matrix specifically for it.
36+
matrix:
37+
include:
38+
- python: 3.4
39+
dist: trusty
40+
env:
41+
- INSTALL_DEB_DEPENDECIES=true
42+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
43+
CI_SKIP_TEST=1
44+
- python: 3.4
45+
dist: trusty
46+
env:
47+
- INSTALL_DEB_DEPENDECIES=false
48+
NIPYPE_EXTRAS="doc,tests,profiler"
49+
CI_SKIP_TEST=1
50+
- python: 3.4
51+
dist: trusty
52+
env:
53+
- INSTALL_DEB_DEPENDECIES=true
54+
NIPYPE_EXTRAS="doc,tests,nipy,profiler,duecredit,ssh"
55+
CI_SKIP_TEST=1
56+
- python: 3.4
57+
dist: trusty
58+
env:
59+
- INSTALL_DEB_DEPENDECIES=true
60+
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
61+
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
62+
CI_SKIP_TEST=1
63+
64+
addons:
65+
apt:
66+
packages:
67+
- xvfb
68+
- fusefat
69+
- graphviz
70+
71+
cache:
72+
directories:
73+
- ${HOME}/.cache
74+
1575
before_install:
16-
- function apt_inst {
17-
if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi &&
18-
if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi &&
19-
bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh) &&
20-
sudo apt-get -y update &&
21-
sudo apt-get -y install xvfb fusefat graphviz &&
22-
if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -y -qq
23-
fsl afni elastix fsl-atlases; fi &&
24-
if $INSTALL_DEB_DEPENDECIES; then
76+
- if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; sudo ln -s /run/shm /dev/shm; fi
77+
- travis_retry bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh);
78+
- if $INSTALL_DEB_DEPENDECIES; then
79+
travis_retry sudo apt-get -y update &&
80+
travis_retry sudo apt-get install -y -qq fsl afni elastix fsl-atlases;
81+
fi;
82+
- if $INSTALL_DEB_DEPENDECIES; then
2583
source /etc/fsl/fsl.sh;
2684
source /etc/afni/afni.sh;
27-
export FSLOUTPUTTYPE=NIFTI_GZ; fi }
28-
- function conda_inst {
29-
export CONDA_HOME=$HOME/conda &&
30-
wget https://repo.continuum.io/miniconda/Miniconda${TRAVIS_PYTHON_VERSION:0:1}-latest-Linux-x86_64.sh
31-
-O /home/travis/.cache/conda.sh &&
32-
bash /home/travis/.cache/conda.sh -b -p ${CONDA_HOME} &&
33-
export PATH=${CONDA_HOME}/bin:$PATH &&
34-
hash -r &&
35-
conda config --set always_yes yes --set changeps1 no &&
36-
conda update -q conda &&
37-
conda config --add channels conda-forge &&
38-
conda install python=${TRAVIS_PYTHON_VERSION} &&
39-
conda install -y icu &&
40-
pip install -r requirements.txt &&
41-
pushd $HOME;
42-
git clone https://github.com/INCF/pybids.git;
43-
cd pybids;
44-
pip install -e .;
45-
popd; }
46-
# Add install of vtk and mayavi to test mesh (disabled): conda install -y vtk mayavi
47-
- travis_retry apt_inst
48-
- travis_retry conda_inst
85+
export FSLOUTPUTTYPE=NIFTI_GZ;
86+
fi;
87+
88+
- travis_retry pip install -r requirements.txt
89+
- travis_retry pip install grabbit==0.1.2
90+
- travis_retry git clone https://github.com/INCF/pybids.git ${HOME}/pybids &&
91+
pip install -e ${HOME}/pybids
92+
4993
install:
50-
- travis_retry pip install $PIP_FLAGS -e .[$NIPYPE_EXTRAS]
94+
- travis_retry pip install $EXTRA_PIP_FLAGS -e .[$NIPYPE_EXTRAS]
95+
5196
script:
52-
- py.test -v --doctest-modules nipype
53-
deploy:
54-
provider: pypi
55-
user: satra
56-
password:
57-
secure: OCO0FXb4f+pH4Uw7zWCIRp3qOJ1t7rhky4K8MjNU8tyVCJgd6O/Bv8GJgceS0LktPodlAAjB8SxAhTORPAQZ1D/44PJYy3NQIisvej1zjLpaA9TEGfl6W7MqhDpRyMHW+cnSi/n84SAmdr+Z4vOxScDHdwr13EPmGyOIlHMAGnE=
58-
on:
59-
tags: true
60-
repo: nipy/nipype
61-
branch: master
62-
distributions: "sdist"
97+
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype
98+
99+
after_script:
100+
- codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER

0 commit comments

Comments
 (0)