Skip to content

Commit 1b4d4a3

Browse files
committed
[ENH] Abandon distutils, only setuptools
1 parent dac763b commit 1b4d4a3

File tree

5 files changed

+217
-384
lines changed

5 files changed

+217
-384
lines changed

docker/nipype_test/Dockerfile_py27

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ RUN pip install -r /root/src/nipype/requirements.txt
4646
COPY . /root/src/nipype
4747
RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
4848
cd /root/src/nipype && \
49-
pip install -e .
49+
pip install -e .[all]
5050

5151
CMD ["/bin/bash"]

docker/nipype_test/Dockerfile_py34

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ RUN pip install -r /root/src/nipype/requirements.txt
5151
COPY . /root/src/nipype
5252
RUN rm -r /usr/local/miniconda/lib/python3.4/site-packages/nipype* && \
5353
cd /root/src/nipype && \
54-
pip install -e .
54+
pip install -e .[all]
5555

5656
CMD ["/bin/bash"]

docker/nipype_test/Dockerfile_py35

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ FROM nipype/nipype_test:base-0.0.2
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
3131

3232
WORKDIR /root
33-
33+
3434
COPY docker/circleci/run_* /usr/bin/
3535
RUN chmod +x /usr/bin/run_*
3636

@@ -49,6 +49,6 @@ RUN pip install -r /root/src/nipype/requirements.txt
4949
COPY . /root/src/nipype
5050
RUN rm -r /usr/local/miniconda/lib/python3.5/site-packages/nipype* && \
5151
cd /root/src/nipype && \
52-
pip install -e .
52+
pip install -e .[all]
5353

5454
CMD ["/bin/bash"]

nipype/info.py

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,35 @@ def get_nipype_gitversion():
133133
ISRELEASE = _version_extra == ''
134134
VERSION = __version__
135135
PROVIDES = ['nipype']
136-
REQUIRES = ["nibabel>=%s" % NIBABEL_MIN_VERSION,
137-
"networkx>=%s" % NETWORKX_MIN_VERSION,
138-
"numpy>=%s" % NUMPY_MIN_VERSION,
139-
"python-dateutil>=%s" % DATEUTIL_MIN_VERSION,
140-
"scipy>=%s" % SCIPY_MIN_VERSION,
141-
"traits>=%s" % TRAITS_MIN_VERSION,
142-
"nose>=%s" % NOSE_MIN_VERSION,
143-
"future>=%s" % FUTURE_MIN_VERSION,
144-
"simplejson>=%s" % SIMPLEJSON_MIN_VERSION,
145-
"prov>=%s" % PROV_MIN_VERSION,
146-
"mock",
147-
"xvfbwrapper"]
136+
REQUIRES = [
137+
"nibabel>=%s" % NIBABEL_MIN_VERSION,
138+
"networkx>=%s" % NETWORKX_MIN_VERSION,
139+
"numpy>=%s" % NUMPY_MIN_VERSION,
140+
"python-dateutil>=%s" % DATEUTIL_MIN_VERSION,
141+
"scipy>=%s" % SCIPY_MIN_VERSION,
142+
"traits>=%s" % TRAITS_MIN_VERSION,
143+
"future>=%s" % FUTURE_MIN_VERSION,
144+
"simplejson>=%s" % SIMPLEJSON_MIN_VERSION,
145+
"prov>=%s" % PROV_MIN_VERSION,
146+
"xvfbwrapper",
147+
"funcsigs"
148+
]
149+
150+
TESTS_REQUIRES = [
151+
"nose>=%s" % NOSE_MIN_VERSION,
152+
"mock",
153+
"codecov",
154+
"doctest-ignore-unicode"
155+
]
156+
157+
EXTRA_REQUIRES = {
158+
'doc': ['Sphinx>=0.3'],
159+
'tests': TESTS_REQUIRES,
160+
'fmri': ['nitime'],
161+
'profiler': ['psutil']
162+
}
163+
164+
# Enable a handle to install all extra dependencies at once
165+
EXTRA_REQUIRES['all'] = [val for _, val in list(EXTRA_REQUIRES.items())]
166+
148167
STATUS = 'stable'

0 commit comments

Comments
 (0)