From 5cd8484131b687ffcf931bdd5df937b14d349115 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Jan 2020 10:14:51 -0500 Subject: [PATCH 1/3] FIX: Update requirements.txt post-1.4 --- requirements.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 14b7e78ecc..9a51735d72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,20 +1,16 @@ click>=6.6.0 -configparser -funcsigs -future>=0.16.0 networkx>=1.9 nibabel>=2.1.0 -numpy>=1.9.0 +numpy>=1.9.0 ; python_version < "3.7" +numpy>=1.15.3 ; python_version >= "3.7" packaging -pathlib2 prov>=1.5.2 -lxml<4.4.0 ; python_version == "3.4" neurdflib pydot>=1.2.3 pydotplus python-dateutil>=2.2 scipy>=0.14 simplejson>=3.8.0 -traits>=4.6 -filelock>= 3.0.0 -etelemetry \ No newline at end of file +traits>=4.6,!=5.0 +filelock>=3.0.0 +etelemetry From 4effc5270b124506a4753c94fcd652b83aa9e581 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Jan 2020 10:17:07 -0500 Subject: [PATCH 2/3] MNT: Add tool to keep requirements in sync --- requirements.txt | 5 +++-- tools/update_requirements.py | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 tools/update_requirements.py diff --git a/requirements.txt b/requirements.txt index 9a51735d72..8f16c7873c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ +# Auto-generated by tools/update_requirements.py click>=6.6.0 networkx>=1.9 nibabel>=2.1.0 -numpy>=1.9.0 ; python_version < "3.7" +numpy>=1.12 ; python_version < "3.7" numpy>=1.15.3 ; python_version >= "3.7" packaging prov>=1.5.2 -neurdflib pydot>=1.2.3 pydotplus python-dateutil>=2.2 @@ -14,3 +14,4 @@ simplejson>=3.8.0 traits>=4.6,!=5.0 filelock>=3.0.0 etelemetry +neurdflib diff --git a/tools/update_requirements.py b/tools/update_requirements.py new file mode 100755 index 0000000000..4dd14a37d7 --- /dev/null +++ b/tools/update_requirements.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from runpy import run_path +from pathlib import Path + +repo_root = Path(__file__).parent.parent +info_file = repo_root / "nipype" / "info.py" +reqs = repo_root / "requirements.txt" + +info = run_path(info_file) +requirements = info["REQUIRES"] + +script_name = Path(__file__).relative_to(repo_root) + +lines = [f"# Auto-generated by {script_name}", ""] + +# Write requirements +lines[1:-1] = requirements +reqs.write_text("\n".join(lines)) From 496299ef7728500cbdf9f1de983bc613c5a584c3 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 15 Jan 2020 11:48:08 -0500 Subject: [PATCH 3/3] CI: Upgrade when installing --pre --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c1f3984e6..3e4326c5a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: CI_SKIP_TEST=1 - INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,nipy,profiler" - EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS" + EXTRA_PIP_FLAGS="--pre $EXTRA_PIP_FLAGS --find-links $PRE_WHEELS --upgrade" CI_SKIP_TEST=1 matrix: