Merge branch 'pytest-parametrize-part1' into pytest-parametrize-non-common-tests

rth · rth · commit 554902b93480 · 2018-05-23T23:51:24.000+02:00
diff --git a/sklearn/ensemble/tests/test_forest.py b/sklearn/ensemble/tests/test_forest.py
@@ -97,7 +97,8 @@
 FOREST_ESTIMATORS.update(FOREST_REGRESSORS)
 FOREST_ESTIMATORS.update(FOREST_TRANSFORMERS)
 
-FOREST_CLASSIFIERS_REGRESSORS = dict(FOREST_CLASSIFIERS, **FOREST_REGRESSORS)
+FOREST_CLASSIFIERS_REGRESSORS = FOREST_CLASSIFIERS.copy()
+FOREST_CLASSIFIERS_REGRESSORS.update(FOREST_REGRESSORS)
 
 
 def check_classification_toy(name):
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
@@ -691,33 +691,39 @@ def run_test(*args, **kwargs):
     return run_test
 
 
-skip_if_32bit = pytest.mark.skipif(8 * struct.calcsize("P") == 32,
-                                   reason='skipped on 32bit platforms')
-skip_travis = pytest.mark.skipif(os.environ.get('TRAVIS') == 'true',
-                                 reason='skip on travis')
-
-
-#  Decorator for tests involving both BLAS calls and multiprocessing.
-#
-#  Under POSIX (e.g. Linux or OSX), using multiprocessing in conjunction with
-#  some implementation of BLAS (or other libraries that manage an internal
-#  posix thread pool) can cause a crash or a freeze of the Python process.
-#
-#  In practice all known packaged distributions (from Linux distros or
-#  Anaconda) of BLAS under Linux seems to be safe. So we this problem seems to
-#  only impact OSX users.
-#
-#  This wrapper makes it possible to skip tests that can possibly cause
-#  this crash under OS X with.
-#
-#  Under Python 3.4+ it is possible to use the `forkserver` start method
-#  for multiprocessing to avoid this issue. However it can cause pickling
-#  errors on interactively defined functions. It therefore not enabled by
-#  default.
-
-if_safe_multiprocessing_with_blas = pytest.mark.skipif(
-        sys.platform == 'darwin',
-        reason="Possible multi-process bug with some BLAS")
+try:
+    import pytest
+
+    skip_if_32bit = pytest.mark.skipif(8 * struct.calcsize("P") == 32,
+                                       reason='skipped on 32bit platforms')
+    skip_travis = pytest.mark.skipif(os.environ.get('TRAVIS') == 'true',
+                                     reason='skip on travis')
+
+    #  Decorator for tests involving both BLAS calls and multiprocessing.
+    #
+    #  Under POSIX (e.g. Linux or OSX), using multiprocessing in conjunction
+    #  with some implementation of BLAS (or other libraries that manage an
+    #  internal posix thread pool) can cause a crash or a freeze of the Python
+    #  process.
+    #
+    #  In practice all known packaged distributions (from Linux distros or
+    #  Anaconda) of BLAS under Linux seems to be safe. So we this problem seems
+    #  to only impact OSX users.
+    #
+    #  This wrapper makes it possible to skip tests that can possibly cause
+    #  this crash under OS X with.
+    #
+    #  Under Python 3.4+ it is possible to use the `forkserver` start method
+    #  for multiprocessing to avoid this issue. However it can cause pickling
+    #  errors on interactively defined functions. It therefore not enabled by
+    #  default.
+
+    if_safe_multiprocessing_with_blas = pytest.mark.skipif(
+            sys.platform == 'darwin',
+            reason="Possible multi-process bug with some BLAS")
+
+except ImportError:
+    pass
 
 
 def clean_warning_registry():
