restoring pydotplus, adding min version to pydot

Author: djarecka

doc/users/install.rst

@@ -47,7 +47,7 @@ use the following command::
 While `all` installs everything, one can also install select components as
 listed below::
 
-    'doc': ['Sphinx>=1.4', 'matplotlib', 'pydot'],
+    'doc': ['Sphinx>=1.4', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
     'tests': ['pytest-cov', 'codecov'],
     'nipy': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
     'profiler': ['psutil'],

nipype/info.py

@@ -107,6 +107,7 @@ def get_nipype_gitversion():
 SIMPLEJSON_MIN_VERSION = '3.8.0'
 PROV_VERSION = '1.5.0'
 CLICK_MIN_VERSION = '6.6.0'
+PYDOT_MIN_VERSION = '1.2.3'
 
 NAME = 'nipype'
 MAINTAINER = 'nipype developers'
@@ -141,7 +142,8 @@ def get_nipype_gitversion():
     'funcsigs',
     'pytest>=%s' % PYTEST_MIN_VERSION,
     'mock',
-    'pydot',
+    'pydotplus',
+    'pydot>=%s' % PYDOT_MIN_VERSION,
     'packaging',
 ]
 
@@ -154,7 +156,7 @@ def get_nipype_gitversion():
 ]
 
 EXTRA_REQUIRES = {
-    'doc': ['Sphinx>=1.4', 'matplotlib', 'pydot'],
+    'doc': ['Sphinx>=1.4', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
     'tests': TESTS_REQUIRES,
     'nipy': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
     'profiler': ['psutil'],

requirements.txt

@@ -12,5 +12,6 @@ funcsigs
 configparser
 pytest>=3.0
 mock
-pydot
+pydotplus
+pydot>=1.2.3
 packaging

rtd_requirements.txt

@@ -11,7 +11,8 @@ funcsigs
 configparser
 pytest>=3.0
 mock
-pydot
+pydotplus
+pydot>=1.2.3
 psutil
 matplotlib
 packaging