fixed outdated code based on xvfbwrapper

Author: oesteban

.travis.yml

@@ -18,6 +18,7 @@ before_install:
 - if $INSTALL_DEB_DEPENDECIES; then sudo ln -s /run/shm /dev/shm; fi
 - bash <(wget -q -O- http://neuro.debian.net/_files/neurodebian-travis.sh)
 - sudo apt-get update
+- sudo apt-get install xvfb
 - if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq --no-install-recommends
   fsl afni elastix; fi
 - if $INSTALL_DEB_DEPENDECIES; then travis_retry sudo apt-get install -qq fsl-atlases;

circle.yml

@@ -14,7 +14,7 @@ dependencies:
     - sudo apt-get update
   override:
     # Install apt packages
-    - sudo apt-get install -y fsl-core fsl-atlases fsl-mni152-templates fsl-feeds afni swig python-vtk
+    - sudo apt-get install -y fsl-core fsl-atlases fsl-mni152-templates fsl-feeds afni swig python-vtk xvfb
     - echo 'source /etc/fsl/fsl.sh' >> $HOME/.profile
     - echo 'source /etc/afni/afni.sh' >> $HOME/.profile
     - mkdir -p ~/examples/ && ln -sf /usr/share/fsl-feeds/ ~/examples/feeds

nipype/interfaces/base.py

@@ -64,17 +64,6 @@ def __init__(self, value):
     def __str__(self):
         return repr(self.value)
 
-
-def _unlock_display(ndisplay):
-    lockf = os.path.join('/tmp', '.X%d-lock' % ndisplay)
-    try:
-        os.remove(lockf)
-    except:
-        return False
-
-    return True
-
-
 def _exists_in_path(cmd, environ):
     '''
     Based on a code snippet from
@@ -987,22 +976,18 @@ def _run_wrapper(self, runtime):
 
             vdisp = Xvfb(nolisten='tcp')
             vdisp.start()
-            vdisp_num = vdisp.vdisplay_num
+            try:
+                vdisp_num = vdisp.new_display
+            except AttributeError:  # outdated version of xvfbwrapper
+                vdisp_num = vdisp.vdisplay_num
 
             iflogger.info('Redirecting X to :%d' % vdisp_num)
             runtime.environ['DISPLAY'] = ':%d' % vdisp_num
 
         runtime = self._run_interface(runtime)
 
         if self._redirect_x:
-            if sysdisplay is None:
-                os.unsetenv('DISPLAY')
-            else:
-                os.environ['DISPLAY'] = sysdisplay
-
-            iflogger.info('Freeing X :%d' % vdisp_num)
             vdisp.stop()
-            _unlock_display(vdisp_num)
 
         return runtime