checking sys.version_info instead of TRAVIS_PYTHON_VERSION in the multiproc tests

Author: djarecka

circle.yml

@@ -35,9 +35,9 @@ dependencies:
 test:
   override:
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /root/src/nipype/doc nipype/nipype_test:py35 /usr/bin/run_builddocs.sh
-    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -e TRAVIS_PYTHON_VERSION="3.5" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py35 /usr/bin/run_pytests.sh py35 :
+    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py35 /usr/bin/run_pytests.sh py35 :
         timeout: 2600
-    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -e TRAVIS_PYTHON_VERSION="2.7" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py27 /usr/bin/run_pytests.sh py27 :
+    - docker run -v /etc/localtime:/etc/localtime:ro -e FSL_COURSE_DATA="/root/examples/nipype-fsl_course_data" -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /root/src/nipype nipype/nipype_test:py27 /usr/bin/run_pytests.sh py27 :
         timeout: 2600
     - docker run -v /etc/localtime:/etc/localtime:ro -v ~/examples:/root/examples:ro -v ~/scratch:/scratch -w /scratch nipype/nipype_test:py35 /usr/bin/run_examples.sh test_spm Linear /root/examples/ workflow3d :
         timeout: 1600

nipype/pipeline/plugins/tests/test_multiproc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
-import os
+import os, sys
 from multiprocessing import cpu_count
 
 import nipype.interfaces.base as nib
@@ -33,7 +33,7 @@ def _list_outputs(self):
         return outputs
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION', '') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 def test_run_multiproc(tmpdir):
     os.chdir(str(tmpdir))
@@ -119,7 +119,7 @@ def find_metrics(nodes, last_node):
     return total_memory, total_threads
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 def test_no_more_memory_than_specified():
     LOG_FILENAME = 'callback.log'
@@ -180,7 +180,7 @@ def test_no_more_memory_than_specified():
     os.remove(LOG_FILENAME)
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION', '') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 @pytest.mark.skipif(nib.runtime_profile == False, reason="runtime_profile=False")
 def test_no_more_threads_than_specified():

nipype/pipeline/plugins/tests/test_multiproc_nondaemon.py

@@ -7,7 +7,7 @@
 from builtins import range, open
 
 # Import packages
-import os
+import os, sys
 from tempfile import mkdtemp
 from shutil import rmtree
 import pytest
@@ -90,7 +90,7 @@ def dummyFunction(filename):
     return total
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION', '') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 def run_multiproc_nondaemon_with_flag(nondaemon_flag):
     '''
@@ -133,7 +133,7 @@ def run_multiproc_nondaemon_with_flag(nondaemon_flag):
     return result
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION', '') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 def test_run_multiproc_nondaemon_false():
     '''
@@ -152,7 +152,7 @@ def test_run_multiproc_nondaemon_false():
     assert shouldHaveFailed
 
 
-@pytest.mark.skipif(os.environ.get('TRAVIS_PYTHON_VERSION', '') == '2.7',
+@pytest.mark.skipif(sys.version_info < (3, 0),
                     reason="Disabled until https://github.com/nipy/nipype/issues/1692 is resolved")
 def test_run_multiproc_nondaemon_true():
     # with nondaemon_flag = True, the execution should succeed