From 748eb2398d1cd8eeed2c90ea54105b9fa2e5920f Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Mon, 30 Jan 2017 09:35:17 -0500 Subject: [PATCH 1/6] changing the traits minimum version --- requirements.txt | 2 +- rtd_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c06bfbfee5..f16073919e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ numpy>=1.6.2 scipy>=0.11 networkx>=1.7 -traits>=4.3 +traits>=4.6 python-dateutil>=1.5 nibabel>=2.0.1 future>=0.15.2 diff --git a/rtd_requirements.txt b/rtd_requirements.txt index a8b426ea8a..43acce5e1f 100644 --- a/rtd_requirements.txt +++ b/rtd_requirements.txt @@ -1,7 +1,7 @@ numpy>=1.6.2 scipy>=0.11 networkx>=1.7 -traits>=4.3 +traits>=4.6 python-dateutil>=1.5 nibabel>=2.0.1 pytest>=3.0 From 098ef060d2d3e28c13844dd8b87371a56463fab2 Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Mon, 30 Jan 2017 11:54:05 -0500 Subject: [PATCH 2/6] adding a temporary test to check the traits version --- nipype/pipeline/engine/tests/test_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nipype/pipeline/engine/tests/test_utils.py b/nipype/pipeline/engine/tests/test_utils.py index f755ebc886..08e5f32405 100644 --- a/nipype/pipeline/engine/tests/test_utils.py +++ b/nipype/pipeline/engine/tests/test_utils.py @@ -18,6 +18,11 @@ from ..utils import merge_dict, clean_working_directory, write_workflow_prov +def test_traits_version(): + #just a temprorary test, testing CI + import traits + assert traits.__version__ >= "4.6.0" + def test_identitynode_removal(): def test_function(arg1, arg2, arg3): From f06ed543601e306e722bfb01e8d0bfb73c0059a1 Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Fri, 3 Feb 2017 08:24:12 -0500 Subject: [PATCH 3/6] checking traits with conda --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f16073919e..616c8aa51d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ numpy>=1.6.2 scipy>=0.11 networkx>=1.7 -traits>=4.6 python-dateutil>=1.5 nibabel>=2.0.1 future>=0.15.2 From 1a5ec1140033207289f646fbbe010dc02b3a4ed9 Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Fri, 3 Feb 2017 08:44:17 -0500 Subject: [PATCH 4/6] conda didnt help, removed the last changes --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 616c8aa51d..c06bfbfee5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ numpy>=1.6.2 scipy>=0.11 networkx>=1.7 +traits>=4.3 python-dateutil>=1.5 nibabel>=2.0.1 future>=0.15.2 From 20b0ca4440ef0f0513bd9b1bfc5e3ccbf5277bee Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Wed, 15 Feb 2017 22:53:32 -0500 Subject: [PATCH 5/6] changing again traits minimum version in requirements (new travis and dockerfiles after rebase) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c06bfbfee5..f16073919e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ numpy>=1.6.2 scipy>=0.11 networkx>=1.7 -traits>=4.3 +traits>=4.6 python-dateutil>=1.5 nibabel>=2.0.1 future>=0.15.2 From 621cc61860cb6a788016450c7437cb98af347d09 Mon Sep 17 00:00:00 2001 From: Dorota Jarecka Date: Thu, 16 Feb 2017 08:04:58 -0500 Subject: [PATCH 6/6] forgot to update info.py --- nipype/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/info.py b/nipype/info.py index d98faae782..ef13ed6d62 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -106,7 +106,7 @@ def get_nipype_gitversion(): NETWORKX_MIN_VERSION = '1.7' NUMPY_MIN_VERSION = '1.6.2' SCIPY_MIN_VERSION = '0.11' -TRAITS_MIN_VERSION = '4.3' +TRAITS_MIN_VERSION = '4.6' DATEUTIL_MIN_VERSION = '1.5' PYTEST_MIN_VERSION = '3.0' FUTURE_MIN_VERSION = '0.15.2'