Skip to content

Commit b41208b

Browse files
author
Joerg Stadler
committed
Merge branch 'master' of https://github.com/nipy/nipype
2 parents 6ab265d + ce65afb commit b41208b

File tree

149 files changed

+3021
-3645
lines changed

Some content is hidden

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

149 files changed

+3021
-3645
lines changed

.circleci/config.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
_machine_kwds: &machine_kwds
2-
image: circleci/classic:201710-02
2+
image: circleci/classic:201808-01
33

44
_store_artifacts_kwds: &store_artifacts_kwds
55
path: /home/circleci/work/tests
@@ -356,6 +356,16 @@ jobs:
356356
pip install dist/nipype-*-py2.py3-none-any.whl
357357
# Futures should not install in Python 3
358358
test $(pip show futures 2>/dev/null | wc -l) = "0"
359+
- run:
360+
name: Validate Python 3.7 installation
361+
command: |
362+
pyenv local 3.7.0
363+
pip install --upgrade pip
364+
# Pre-install a version of numpy that will not pass
365+
pip install numpy==1.15.0
366+
pip install dist/nipype-*-py2.py3-none-any.whl
367+
# Numpy should be upgraded to >= 1.15.3
368+
test "$(pip show numpy | grep Version)" \> "Version: 1.15.2"
359369
- store_artifacts:
360370
path: /home/circleci/nipype/dist
361371

.mailmap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
33
Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
44
Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
55
Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
6+
Alejandro de la Vega <aleph4@gmail.com> delavega4 <aleph4@gmail.com>
67
Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
78
Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
89
Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
@@ -40,6 +41,7 @@ Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <effigies@gmail.
4041
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Johnson <effigies@gmail.com>
4142
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <effigies@bu.edu>
4243
Christopher J. Markiewicz <effigies@gmail.com> Christopher J. Markiewicz <markiewicz@stanford.edu>
44+
Christopher J. Markiewicz <effigies@gmail.com> Chris Markiewicz <markiewicz@stanford.edu>
4345
Cindee Madison <cindee@berkeley.edu> cindeem
4446
Cindee Madison <cindee@berkeley.edu> cindeem <>
4547
Colin Buchanan <colinrbuchanan@gmail.com> Colin Buchanan <cbuchanan@cray4.(none)>
@@ -62,6 +64,7 @@ Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
6264
Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
6365
Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
6466
Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
67+
Feilong Ma <mafeilong@gmail.com> Ma Feilong <mafeilong@gmail.com>
6568
Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
6669
Franz Liem <franz.liem@gmail.com> fliem <franz.liem>
6770
Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>
@@ -93,7 +96,7 @@ Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu
9396
Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
9497
Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
9598
Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
96-
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
99+
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu>
97100
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshi.jordan@gmail.com>
98101
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
99102
Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-69-91-152-99.dhcp4.washington.edu>

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ matrix:
6060
NIPYPE_EXTRAS="doc,tests,nipy,profiler"
6161
EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS"
6262
CI_SKIP_TEST=1
63+
allow_failures:
64+
- python: 2.7
65+
env: INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1
6366

6467
addons:
6568
apt:
@@ -86,14 +89,15 @@ before_install:
8689
fi;
8790

8891
- travis_retry pip install -r requirements.txt
89-
- travis_retry pip install grabbit==0.1.2
90-
- travis_retry git clone -b 0.6.5 https://github.com/INCF/pybids.git ${HOME}/pybids && pip install -e ${HOME}/pybids
92+
- travis_retry pip install grabbit==0.2.6
93+
- travis_retry pip install -e git+https://github.com/bids-standard/pybids.git@0.7.0#egg=pybids
9194

9295
install:
9396
- travis_retry pip install $EXTRA_PIP_FLAGS -e .[$NIPYPE_EXTRAS]
97+
- travis_retry pip install pytest-xdist
9498

9599
script:
96-
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype
100+
- py.test -v --cov nipype --cov-config .coveragerc --cov-report xml:cov.xml -c nipype/pytest.ini --doctest-modules nipype -n auto
97101

98102
after_script:
99103
- codecov --file cov.xml --flags unittests -e TRAVIS_JOB_NUMBER

0 commit comments

Comments
 (0)