Skip to content

Commit 20aedc6

Browse files
satraBen Cipollini
authored andcommitted
fix: changing setup.py and circleci.yml for requirements
1 parent 3a01d1a commit 20aedc6

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

circle.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- "~/examples/fsl_course_data"
1010
override:
1111
- pip install --upgrade pip
12-
- pip install -r requirements.txt
1312
- pip install -e .
1413
- pip install matplotlib sphinx ipython boto
1514
- gem install fakes3

nipype/info.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ def get_nipype_gitversion():
108108
TRAITS_MIN_VERSION = '4.3'
109109
DATEUTIL_MIN_VERSION = '1.5'
110110
NOSE_MIN_VERSION = '1.2'
111+
FUTURE_MIN_VERSION = '0.15.2'
112+
SIMPLEJSON_MIN_VERSION = '3.8.0'
111113

112114
NAME = 'nipype'
113115
MAINTAINER = "nipype developers"
@@ -127,18 +129,13 @@ def get_nipype_gitversion():
127129
ISRELEASE = _version_extra == ''
128130
VERSION = __version__
129131
PROVIDES = ['nipype']
130-
REQUIRES = ["nibabel (>=%s)" % NIBABEL_MIN_VERSION,
131-
"networkx (>=%s)" % NETWORKX_MIN_VERSION,
132-
"numpy (>=%s)" % NUMPY_MIN_VERSION,
133-
"python-dateutil (>=%s)" % DATEUTIL_MIN_VERSION,
134-
"scipy (>=%s)" % SCIPY_MIN_VERSION,
135-
"traits (>=%s)" % TRAITS_MIN_VERSION,
136-
"nose (>=%s)" % NOSE_MIN_VERSION]
137132
REQUIRES = ["nibabel>=%s" % NIBABEL_MIN_VERSION,
138133
"networkx>=%s" % NETWORKX_MIN_VERSION,
139134
"numpy>=%s" % NUMPY_MIN_VERSION,
140135
"python-dateutil>=%s" % DATEUTIL_MIN_VERSION,
141136
"scipy>=%s" % SCIPY_MIN_VERSION,
142137
"traits>=%s" % TRAITS_MIN_VERSION,
143-
"nose>=%s" % NOSE_MIN_VERSION]
138+
"nose>=%s" % NOSE_MIN_VERSION,
139+
"future>=%s" % FUTURE_MIN_VERSION,
140+
"simplejson>=%s" % SIMPLEJSON_MIN_VERSION]
144141
STATUS = 'stable'

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ def _package_status(pkg_name, version, version_getter, checker):
272272
pkg_chk('scipy', SCIPY_MIN_VERSION)
273273
pkg_chk('traits', TRAITS_MIN_VERSION)
274274
pkg_chk('nose', NOSE_MIN_VERSION)
275+
pkg_chk('future', FUTURE_MIN_VERSION)
276+
pkg_chk('simplejson', SIMPLEJSON_MIN_VERSION)
275277
custom_dateutil_messages = {'missing opt': ('Missing optional package "%s"'
276278
' provided by package '
277279
'"python-dateutil"')}

0 commit comments

Comments
 (0)