Skip to content

Commit 14b55f8

Browse files
committed
changing requirements.txt and info.py: removing nose and doctest-ignore-unicode, adding pytest; removing extra installation from travis
1 parent f00bb52 commit 14b55f8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ install:
3333
conda config --add channels conda-forge &&
3434
conda update --yes conda &&
3535
conda update --all -y python=$TRAVIS_PYTHON_VERSION pytest &&
36-
pip install pytest-raisesregexp &&
37-
pip install pytest-cov &&
38-
pip install click &&
3936
conda install -y nipype &&
4037
rm -r /home/travis/miniconda/lib/python${TRAVIS_PYTHON_VERSION}/site-packages/nipype* &&
4138
pip install -r requirements.txt &&

nipype/info.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def get_nipype_gitversion():
108108
SCIPY_MIN_VERSION = '0.11'
109109
TRAITS_MIN_VERSION = '4.3'
110110
DATEUTIL_MIN_VERSION = '1.5'
111-
NOSE_MIN_VERSION = '1.2'
111+
PYTEST_MIN_VERSION = '3.0'
112112
FUTURE_MIN_VERSION = '0.15.2'
113113
SIMPLEJSON_MIN_VERSION = '3.8.0'
114114
PROV_MIN_VERSION = '1.4.0'
@@ -149,17 +149,18 @@ def get_nipype_gitversion():
149149
]
150150

151151
TESTS_REQUIRES = [
152-
'nose>=%s' % NOSE_MIN_VERSION,
152+
'pytest>=%s' % PYTEST_MIN_VERSION,
153+
'pytest-raisesregexp'
154+
'pytest-cov'
153155
'mock',
154156
'codecov',
155-
'doctest-ignore-unicode',
156157
'dipy',
157158
'nipy',
158159
'matplotlib'
159160
]
160161

161162
EXTRA_REQUIRES = {
162-
'doc': ['Sphinx>=0.3', 'matplotlib', 'pydotplus', 'doctest-ignore-unicode'],
163+
'doc': ['Sphinx>=0.3', 'matplotlib', 'pydotplus'],
163164
'tests': TESTS_REQUIRES,
164165
'fmri': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
165166
'profiler': ['psutil'],

requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ networkx>=1.7
44
traits>=4.3
55
python-dateutil>=1.5
66
nibabel>=2.0.1
7-
nose>=1.2
87
future==0.15.2
98
simplejson>=3.8.0
109
prov>=1.4.0
@@ -13,4 +12,7 @@ xvfbwrapper
1312
psutil
1413
funcsigs
1514
configparser
16-
doctest-ignore-unicode
15+
doctest-ignore-unicode
16+
pytest>=3.0
17+
pytest-raisesregexp
18+
pytest-cov

0 commit comments

Comments
 (0)