Skip to content

Commit ede7020

Browse files
authored
Merge pull request #2855 from effigies/maint/numpy_version
MAINT: Disable numpy 1.16.0 for Py2.7
2 parents 041068b + f52df97 commit ede7020

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.travis.yml

+3
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:

nipype/info.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ def get_nipype_gitversion():
105105
# Numpy bug in python 3.7:
106106
# https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html
107107
NUMPY_MIN_VERSION_37 = '1.15.3'
108+
NUMPY_BAD_VERSION_27 = '1.16.0'
108109
SCIPY_MIN_VERSION = '0.14'
109110
TRAITS_MIN_VERSION = '4.6'
110111
DATEUTIL_MIN_VERSION = '2.2'
@@ -136,7 +137,8 @@ def get_nipype_gitversion():
136137
REQUIRES = [
137138
'nibabel>=%s' % NIBABEL_MIN_VERSION,
138139
'networkx>=%s' % NETWORKX_MIN_VERSION,
139-
'numpy>=%s ; python_version < "3.7"' % NUMPY_MIN_VERSION,
140+
'numpy>=%s,!=%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_BAD_VERSION_27),
141+
'numpy>=%s ; python_version > "3.0" and python_version < "3.7"' % NUMPY_MIN_VERSION,
140142
'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37,
141143
'python-dateutil>=%s' % DATEUTIL_MIN_VERSION,
142144
'scipy>=%s' % SCIPY_MIN_VERSION,

0 commit comments

Comments
 (0)