Merge pull request #1819 from TheChymera/xvfbwrapper

removed obligatory xvfbwrapper dependency

Author: satra

nipype/info.py

@@ -143,7 +143,6 @@ def get_nipype_gitversion():
     'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
     'prov>=%s' % PROV_MIN_VERSION,
     'click>=%s' % CLICK_MIN_VERSION,
-    'xvfbwrapper',
     'funcsigs',
     'configparser',
     'pytest>=%s' % PYTEST_MIN_VERSION
@@ -165,11 +164,11 @@ def get_nipype_gitversion():
     'fmri': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
     'profiler': ['psutil'],
     'duecredit': ['duecredit'],
+    'xvfbwrapper': ['xvfbwrapper'],
     # 'mesh': ['mayavi']  # Enable when it works
 }
 
 # Enable a handle to install all extra dependencies at once
 EXTRA_REQUIRES['all'] = [val for _, val in list(EXTRA_REQUIRES.items())]
 
 STATUS = 'stable'
-

requirements.txt

@@ -8,7 +8,6 @@ future>=0.15.2
 simplejson>=3.8.0
 prov>=1.4.0
 click>=6.6.0
-xvfbwrapper
 psutil
 funcsigs
 configparser

rtd_requirements.txt

@@ -9,7 +9,6 @@ pytest-cov
 future>=0.15.2
 simplejson>=3.8.0
 prov>=1.4.0
-xvfbwrapper
 psutil
 funcsigs
 configparser