Merge pull request #2961 from oesteban/maint/reorder-deps

MAINT: Sort dependencies alphabetically

Author: oesteban

nipype/info.py

@@ -135,48 +135,51 @@ 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',
+    'pathlib2; python_version <= "3.4"',
+    '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"',
-    'pathlib2; 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
 }
 

requirements.txt

@@ -1,17 +1,17 @@
-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
 nibabel>=2.1.0
-future>=0.16.0
-simplejson>=3.8.0
+numpy>=1.9.0
+packaging
+pathlib2
 prov>=1.5.2
 neurdflib
-click>=6.6.0
-funcsigs
-configparser
-pathlib2
-pydotplus
 pydot>=1.2.3
-packaging
+pydotplus
+python-dateutil>=2.2
+scipy>=0.14
+simplejson>=3.8.0
+traits>=4.6

rtd_requirements.txt

@@ -1,19 +1,20 @@
-numpy>=1.9.0
-scipy>=0.14
-networkx>=1.9
-traits>=4.6
-python-dateutil>=2.2
-nibabel>=2.1.0
-future>=0.16.0
-simplejson>=3.8.0
-prov==1.5.0
-funcsigs
 configparser
-pytest>=3.0
-mock
-pydotplus
-pydot>=1.2.3
-psutil
+funcsigs
+future>=0.16.0
 matplotlib
-packaging
+mock
+networkx>=1.9
+nibabel>=2.1.0
+numpy>=1.9.0
 numpydoc
+packaging
+prov>=1.5.2
+neurdflib
+psutil
+pydot>=1.2.3
+pydotplus
+pytest>=3.0
+python-dateutil>=2.2
+scipy>=0.14
+simplejson>=3.8.0
+traits>=4.6