Skip to content

changing the traits minimum version #1791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 22, 2017
Merged

changing the traits minimum version #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
748eb23
changing the traits minimum version
djarecka Jan 30, 2017
098ef06
adding a temporary test to check the traits version
djarecka Jan 30, 2017
f06ed54
checking traits with conda
djarecka Feb 3, 2017
1a5ec11
conda didnt help, removed the last changes
djarecka Feb 3, 2017
20b0ca4
changing again traits minimum version in requirements (new travis and…
djarecka Feb 16, 2017
621cc61
forgot to update info.py
djarecka Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nipype/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 5 additions & 0 deletions nipype/pipeline/engine/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged this a little too quickly, while this works most of the time, we should use LooseVersion, which does a better check.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. Actually, we should have like a pre-install hook (we've talked about it) to check versions.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually that was my temporary test, when wanted to be sure that Travis indeed uses traits4.6 and still gives the segfault.
I should probably just remove this test...


def test_identitynode_removal():

def test_function(arg1, arg2, arg3):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion rtd_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down