From b1f7b932bfab25c9f662f9130c5f3f80b215d1aa Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Sun, 29 Oct 2017 17:45:40 -0400 Subject: [PATCH 1/4] allow prov to use latest release --- nipype/info.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/info.py b/nipype/info.py index d7b1b106d1..2c2c1fc405 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -137,7 +137,7 @@ def get_nipype_gitversion(): 'traits>=%s' % TRAITS_MIN_VERSION, 'future>=%s' % FUTURE_MIN_VERSION, 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, - 'prov==%s' % PROV_VERSION, + 'prov>=%s' % PROV_VERSION, 'click>=%s' % CLICK_MIN_VERSION, 'funcsigs', 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/requirements.txt b/requirements.txt index a5ac0a5683..204be32147 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ python-dateutil>=1.5 nibabel>=2.1.0 future>=0.16.0 simplejson>=3.8.0 -prov==1.5.0 +prov>=1.5.0 click>=6.6.0 funcsigs configparser From b18e2aa34a8275bea71b2af514a285cf4e42babc Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Thu, 13 Sep 2018 10:17:53 -0400 Subject: [PATCH 2/4] try tgbugs rdflib --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 027bb13f30..e7e6f743b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,8 @@ python-dateutil>=2.2 nibabel>=2.1.0 future>=0.16.0 simplejson>=3.8.0 -prov>=1.5.0 +https://github.com/tgbugs/rdflib/releases/download/v5.0.0-dev-tgbugs-b6/rdflib-5.0.0.dev0-py2.py3-none-any.whl +prov click>=6.6.0 funcsigs configparser From 332ba1e7b17224ffaf6b9920dd2879e6c99362cc Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Wed, 19 Sep 2018 12:30:43 -0400 Subject: [PATCH 3/4] fix: attempt setup.py and docker install change --- docker/generate_dockerfiles.sh | 2 +- nipype/info.py | 3 ++- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/generate_dockerfiles.sh b/docker/generate_dockerfiles.sh index bd1fcb637e..62cce6d0bd 100755 --- a/docker/generate_dockerfiles.sh +++ b/docker/generate_dockerfiles.sh @@ -105,7 +105,7 @@ function generate_main_dockerfile() { icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko pandas psutil scikit-learn scipy traits=4.6.0' \ pip_opts="-e" \ - pip_install="/src/nipype[all]" \ + pip_install="/src/nipype[all] -f https://github.com/tgbugs/rdflib/releases/download/v5.0.0-dev-tgbugs-b6/rdflib-5.0.0.dev0-py2.py3-none-any.whl" \ --miniconda env_name=neuro \ pip_install="grabbit==0.1.2" \ --run-bash "mkdir -p /src/pybids diff --git a/nipype/info.py b/nipype/info.py index 4ff46f6236..cf0bb4053a 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -108,7 +108,7 @@ def get_nipype_gitversion(): PYTEST_MIN_VERSION = '3.0' FUTURE_MIN_VERSION = '0.16.0' SIMPLEJSON_MIN_VERSION = '3.8.0' -PROV_VERSION = '1.5.0' +PROV_VERSION = '1.5.2' CLICK_MIN_VERSION = '6.6.0' PYDOT_MIN_VERSION = '1.2.3' @@ -140,6 +140,7 @@ def get_nipype_gitversion(): 'future>=%s' % FUTURE_MIN_VERSION, 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, 'prov>=%s' % PROV_VERSION, + 'rdflib>=5.0.0.dev', 'click>=%s' % CLICK_MIN_VERSION, 'funcsigs', 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/requirements.txt b/requirements.txt index e7e6f743b8..16ca072272 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ nibabel>=2.1.0 future>=0.16.0 simplejson>=3.8.0 https://github.com/tgbugs/rdflib/releases/download/v5.0.0-dev-tgbugs-b6/rdflib-5.0.0.dev0-py2.py3-none-any.whl -prov +prov>=1.5.2 click>=6.6.0 funcsigs configparser From 6d3e20901de47bf68badf2dbaf0dbb10f85c865a Mon Sep 17 00:00:00 2001 From: Satrajit Ghosh Date: Wed, 19 Sep 2018 20:52:35 -0400 Subject: [PATCH 4/4] fix: test neurdflib install order --- docker/generate_dockerfiles.sh | 2 +- nipype/info.py | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/generate_dockerfiles.sh b/docker/generate_dockerfiles.sh index 62cce6d0bd..bd1fcb637e 100755 --- a/docker/generate_dockerfiles.sh +++ b/docker/generate_dockerfiles.sh @@ -105,7 +105,7 @@ function generate_main_dockerfile() { icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko pandas psutil scikit-learn scipy traits=4.6.0' \ pip_opts="-e" \ - pip_install="/src/nipype[all] -f https://github.com/tgbugs/rdflib/releases/download/v5.0.0-dev-tgbugs-b6/rdflib-5.0.0.dev0-py2.py3-none-any.whl" \ + pip_install="/src/nipype[all]" \ --miniconda env_name=neuro \ pip_install="grabbit==0.1.2" \ --run-bash "mkdir -p /src/pybids diff --git a/nipype/info.py b/nipype/info.py index cf0bb4053a..f6397fda32 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -140,7 +140,7 @@ def get_nipype_gitversion(): 'future>=%s' % FUTURE_MIN_VERSION, 'simplejson>=%s' % SIMPLEJSON_MIN_VERSION, 'prov>=%s' % PROV_VERSION, - 'rdflib>=5.0.0.dev', + 'neurdflib', 'click>=%s' % CLICK_MIN_VERSION, 'funcsigs', 'pytest>=%s' % PYTEST_MIN_VERSION, diff --git a/requirements.txt b/requirements.txt index 16ca072272..1d1a4d1f9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,8 +6,8 @@ python-dateutil>=2.2 nibabel>=2.1.0 future>=0.16.0 simplejson>=3.8.0 -https://github.com/tgbugs/rdflib/releases/download/v5.0.0-dev-tgbugs-b6/rdflib-5.0.0.dev0-py2.py3-none-any.whl prov>=1.5.2 +neurdflib click>=6.6.0 funcsigs configparser