Skip to content

MAINT: Sort dependencies alphabetically #2961

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 5 commits into from
Jul 17, 2019
Merged

MAINT: Sort dependencies alphabetically #2961

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0204617
MAINT: Sort dependencies alphabetically
oesteban Jul 16, 2019
f7de5db
pin(neurodocker): set docker image tagged 0.5.0
oesteban Jul 17, 2019
0ac149e
enh: make sure neurdflib comes after prov
oesteban Jul 17, 2019
35c1796
Merge remote-tracking branch 'upstream/master' into maint/reorder-deps
oesteban Jul 17, 2019
772d0c8
Update rtd_requirements.txt
oesteban Jul 17, 2019
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
4 changes: 2 additions & 2 deletions docker/generate_dockerfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ do
esac
done

# neurodocker version 0.4.1-22-g7c44e01
NEURODOCKER_IMAGE="kaczmarj/neurodocker:master@sha256:858632a7533cac100f70932749b4cfc77fc40f667f41fca208f406215cff8a27"
# neurodocker version 0.5.0
NEURODOCKER_IMAGE="kaczmarj/neurodocker:0.5.0"
# neurodebian:stretch-non-free pulled on September 19, 2018
BASE_IMAGE="neurodebian:stretch-non-free@sha256:7cd978427d7ad215834fee221d0536ed7825b3cddebc481eba2d792dfc2f7332"

Expand Down
43 changes: 23 additions & 20 deletions nipype/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,47 +135,50 @@ def get_nipype_gitversion():
VERSION = __version__
PROVIDES = ['nipype']
REQUIRES = [
'nibabel>=%s' % NIBABEL_MIN_VERSION,
'networkx>=%s,<=%s ; python_version < "3.0"' % (NETWORKX_MIN_VERSION, NETWORKX_MAX_VERSION_27),
'click>=%s' % CLICK_MIN_VERSION,
'configparser; python_version <= "3.4"',
'funcsigs',
'future>=%s' % FUTURE_MIN_VERSION,
'futures; python_version == "2.7"',
'networkx>=%s ; python_version >= "3.0"' % NETWORKX_MIN_VERSION,
'numpy>=%s,!=%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_BAD_VERSION_27),
'networkx>=%s,<=%s ; python_version < "3.0"' % (NETWORKX_MIN_VERSION, NETWORKX_MAX_VERSION_27),
'nibabel>=%s' % NIBABEL_MIN_VERSION,
'numpy>=%s ; python_version > "3.0" and python_version < "3.7"' % NUMPY_MIN_VERSION,
'numpy>=%s ; python_version >= "3.7"' % NUMPY_MIN_VERSION_37,
'numpy>=%s,!=%s ; python_version == "2.7"' % (NUMPY_MIN_VERSION, NUMPY_BAD_VERSION_27),
'packaging',
'prov>=%s' % PROV_VERSION,
'pydot>=%s' % PYDOT_MIN_VERSION,
'pydotplus',
'python-dateutil>=%s' % DATEUTIL_MIN_VERSION,
'scipy>=%s' % SCIPY_MIN_VERSION,
'traits>=%s,!=5.0' % TRAITS_MIN_VERSION,
'future>=%s' % FUTURE_MIN_VERSION,
'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
'prov>=%s' % PROV_VERSION,
'neurdflib',
'click>=%s' % CLICK_MIN_VERSION,
'funcsigs',
'pydotplus',
'pydot>=%s' % PYDOT_MIN_VERSION,
'packaging',
'futures; python_version == "2.7"',
'configparser; python_version <= "3.4"',
'traits>=%s,!=5.0' % TRAITS_MIN_VERSION,
]

# neurdflib has to come after prov
# https://github.com/nipy/nipype/pull/2961#issuecomment-512035484
REQUIRES += ['neurdflib']

TESTS_REQUIRES = [
'codecov',
'coverage<5',
'mock',
'pytest',
'pytest-cov',
'codecov',
'pytest-env',
'coverage<5'
]

EXTRA_REQUIRES = {
'doc': ['Sphinx>=1.4', 'numpydoc', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
'tests': TESTS_REQUIRES,
'specs': ['yapf'],
'duecredit': ['duecredit'],
'nipy': ['nitime', 'nilearn<0.5.0', 'dipy', 'nipy', 'matplotlib'],
'profiler': ['psutil>=5.0'],
'duecredit': ['duecredit'],
'xvfbwrapper': ['xvfbwrapper'],
'pybids': ['pybids>=0.7.0'],
'specs': ['yapf'],
'ssh': ['paramiko'],
'tests': TESTS_REQUIRES,
'xvfbwrapper': ['xvfbwrapper'],
# 'mesh': ['mayavi'] # Enable when it works
}

Expand Down
24 changes: 12 additions & 12 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
numpy>=1.9.0
scipy>=0.14
click>=6.6.0
configparser
funcsigs
future>=0.16.0
networkx>=1.9
traits>=4.6
python-dateutil>=2.2
neurdflib
nibabel>=2.1.0
future>=0.16.0
simplejson>=3.8.0
numpy>=1.9.0
packaging
prov>=1.5.2
neurdflib
click>=6.6.0
funcsigs
configparser
pydotplus
pydot>=1.2.3
packaging
pydotplus
python-dateutil>=2.2
scipy>=0.14
simplejson>=3.8.0
traits>=4.6
30 changes: 15 additions & 15 deletions rtd_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
numpy>=1.9.0
scipy>=0.14
configparser
funcsigs
future>=0.16.0
matplotlib
mock
networkx>=1.9
traits>=4.6
python-dateutil>=2.2
nibabel>=2.1.0
future>=0.16.0
simplejson>=3.8.0
numpy>=1.9.0
numpydoc
packaging
prov==1.5.0
funcsigs
configparser
pytest>=3.0
mock
pydotplus
pydot>=1.2.3
psutil
matplotlib
packaging
numpydoc
pydot>=1.2.3
pydotplus
pytest>=3.0
python-dateutil>=2.2
scipy>=0.14
simplejson>=3.8.0
traits>=4.6