From 2bd4fc2fc5605b6cdd5a966a0931fcdd449ba662 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Mon, 14 Jan 2019 13:30:25 -0500 Subject: [PATCH 1/3] MAINT: Disable numpy 1.16.0 for Py2.7 --- nipype/info.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index 5780b71e1d..fabec3a1ca 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -105,6 +105,7 @@ def get_nipype_gitversion(): # Numpy bug in python 3.7: # https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html NUMPY_MIN_VERSION_37 = '1.15.3' +NUMPY_MAX_VERSION_27 = '1.16.0' SCIPY_MIN_VERSION = '0.14' TRAITS_MIN_VERSION = '4.6' DATEUTIL_MIN_VERSION = '2.2' @@ -136,7 +137,8 @@ def get_nipype_gitversion(): REQUIRES = [ 'nibabel>=%s' % NIBABEL_MIN_VERSION, 'networkx>=%s' % NETWORKX_MIN_VERSION, - 'numpy>=%s ; python_version < "3.7"' % NUMPY_MIN_VERSION, + 'numpy>=%s,<%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_MAX_VERSION_27), + 'numpy>=%s ; python_version > "3.0" and python_version < "3.7"' % NUMPY_MIN_VERSION, 'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37, 'python-dateutil>=%s' % DATEUTIL_MIN_VERSION, 'scipy>=%s' % SCIPY_MIN_VERSION, From 704e231a057526ecb1d1708aa6b74746c6fc000c Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Tue, 15 Jan 2019 11:55:29 -0500 Subject: [PATCH 2/3] MAINT: Specifically exclude numpy 1.16.0 --- nipype/info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index fabec3a1ca..7b1a757789 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -105,7 +105,7 @@ def get_nipype_gitversion(): # Numpy bug in python 3.7: # https://www.opensourceanswers.com/blog/you-shouldnt-use-python-37-for-data-science-right-now.html NUMPY_MIN_VERSION_37 = '1.15.3' -NUMPY_MAX_VERSION_27 = '1.16.0' +NUMPY_BAD_VERSION_27 = '1.16.0' SCIPY_MIN_VERSION = '0.14' TRAITS_MIN_VERSION = '4.6' DATEUTIL_MIN_VERSION = '2.2' @@ -137,7 +137,7 @@ def get_nipype_gitversion(): REQUIRES = [ 'nibabel>=%s' % NIBABEL_MIN_VERSION, 'networkx>=%s' % NETWORKX_MIN_VERSION, - 'numpy>=%s,<%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_MAX_VERSION_27), + 'numpy>=%s,!=%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_BAD_VERSION_27), 'numpy>=%s ; python_version > "3.0" and python_version < "3.7"' % NUMPY_MIN_VERSION, 'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37, 'python-dateutil>=%s' % DATEUTIL_MIN_VERSION, From f52df975cab8c9a35a1ae6d8e065e38fc1be1280 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Tue, 15 Jan 2019 13:08:37 -0500 Subject: [PATCH 3/3] CI: Allow 2.7 --pre failures for now --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 37316aea61..871e176ff0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,9 @@ matrix: NIPYPE_EXTRAS="doc,tests,nipy,profiler" EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" CI_SKIP_TEST=1 + allow_failures: + - python: 2.7 + 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 addons: apt: