MAINT Move conftest up a level (scikit-learn#20208)

Co-authored-by: Olivier Grisel <[email protected]>
randomgeek78 · Jun 11, 2021 · 038c5cd · 038c5cd
1 parent e71ae40
commit 038c5cd
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 85 deletions.
diff --git a/conftest.py b/conftest.py
@@ -4,88 +4,3 @@
 # details. For example, this allows to build extensions in place and run pytest
 # doc/modules/clustering.rst and use sklearn from the local folder rather than
 # the one from site-packages.
-
-import platform
-import sys
-
-import pytest
-from _pytest.doctest import DoctestItem
-
-from sklearn.utils import _IS_32BIT
-from sklearn.externals import _pilutil
-from sklearn._min_dependencies import PYTEST_MIN_VERSION
-from sklearn.utils.fixes import np_version, parse_version
-
-if parse_version(pytest.__version__) < parse_version(PYTEST_MIN_VERSION):
-    raise ImportError('Your version of pytest is too old, you should have '
-                      'at least pytest >= {} installed.'
-                      .format(PYTEST_MIN_VERSION))
-
-
-def pytest_collection_modifyitems(config, items):
-    for item in items:
-        # FeatureHasher is not compatible with PyPy
-        if (item.name.endswith(('_hash.FeatureHasher',
-                                'text.HashingVectorizer'))
-                and platform.python_implementation() == 'PyPy'):
-            marker = pytest.mark.skip(
-                reason='FeatureHasher is not compatible with PyPy')
-            item.add_marker(marker)
-        # Known failure on with GradientBoostingClassifier on ARM64
-        elif (item.name.endswith('GradientBoostingClassifier')
-                and platform.machine() == 'aarch64'):
-
-            marker = pytest.mark.xfail(
-                reason=(
-                    'know failure. See '
-                    'https://github.com/scikit-learn/scikit-learn/issues/17797'  # noqa
-                )
-            )
-            item.add_marker(marker)
-
-    # numpy changed the str/repr formatting of numpy arrays in 1.14. We want to
-    # run doctests only for numpy >= 1.14.
-    skip_doctests = False
-    try:
-        if np_version < parse_version('1.14'):
-            reason = 'doctests are only run for numpy >= 1.14'
-            skip_doctests = True
-        elif _IS_32BIT:
-            reason = ('doctest are only run when the default numpy int is '
-                      '64 bits.')
-            skip_doctests = True
-        elif sys.platform.startswith("win32"):
-            reason = ("doctests are not run for Windows because numpy arrays "
-                      "repr is inconsistent across platforms.")
-            skip_doctests = True
-    except ImportError:
-        pass
-
-    if skip_doctests:
-        skip_marker = pytest.mark.skip(reason=reason)
-
-        for item in items:
-            if isinstance(item, DoctestItem):
-                item.add_marker(skip_marker)
-    elif not _pilutil.pillow_installed:
-        skip_marker = pytest.mark.skip(reason="pillow (or PIL) not installed!")
-        for item in items:
-            if item.name in [
-                    "sklearn.feature_extraction.image.PatchExtractor",
-                    "sklearn.feature_extraction.image.extract_patches_2d"]:
-                item.add_marker(skip_marker)
-
-
-def pytest_configure(config):
-    import sys
-    sys._is_pytest_session = True
-    # declare our custom markers to avoid PytestUnknownMarkWarning
-    config.addinivalue_line(
-        "markers",
-        "network: mark a test for execution if network available."
-    )
-
-
-def pytest_unconfigure(config):
-    import sys
-    del sys._is_pytest_session
diff --git a/sklearn/conftest.py b/sklearn/conftest.py
@@ -1,11 +1,18 @@
 import os
 from os import environ
 from functools import wraps
+import platform
+import sys
 
 import pytest
 from threadpoolctl import threadpool_limits
+from _pytest.doctest import DoctestItem
 
+from sklearn.utils import _IS_32BIT
 from sklearn.utils._openmp_helpers import _openmp_effective_n_threads
+from sklearn.externals import _pilutil
+from sklearn._min_dependencies import PYTEST_MIN_VERSION
+from sklearn.utils.fixes import np_version, parse_version
 from sklearn.datasets import fetch_20newsgroups
 from sklearn.datasets import fetch_20newsgroups_vectorized
 from sklearn.datasets import fetch_california_housing
@@ -15,6 +22,11 @@
 from sklearn.datasets import fetch_rcv1
 
 
+if parse_version(pytest.__version__) < parse_version(PYTEST_MIN_VERSION):
+    raise ImportError('Your version of pytest is too old, you should have '
+                      'at least pytest >= {} installed.'
+                      .format(PYTEST_MIN_VERSION))
+
 dataset_fetchers = {
     'fetch_20newsgroups_fxt': fetch_20newsgroups,
     'fetch_20newsgroups_vectorized_fxt': fetch_20newsgroups_vectorized,
@@ -93,6 +105,58 @@ def pytest_collection_modifyitems(config, items):
         for name in datasets_to_download:
             dataset_fetchers[name]()
 
+    for item in items:
+        # FeatureHasher is not compatible with PyPy
+        if (item.name.endswith(('_hash.FeatureHasher',
+                                'text.HashingVectorizer'))
+                and platform.python_implementation() == 'PyPy'):
+            marker = pytest.mark.skip(
+                reason='FeatureHasher is not compatible with PyPy')
+            item.add_marker(marker)
+        # Known failure on with GradientBoostingClassifier on ARM64
+        elif (item.name.endswith('GradientBoostingClassifier')
+                and platform.machine() == 'aarch64'):
+
+            marker = pytest.mark.xfail(
+                reason=(
+                    'know failure. See '
+                    'https://github.com/scikit-learn/scikit-learn/issues/17797'  # noqa
+                )
+            )
+            item.add_marker(marker)
+
+    # numpy changed the str/repr formatting of numpy arrays in 1.14. We want to
+    # run doctests only for numpy >= 1.14.
+    skip_doctests = False
+    try:
+        if np_version < parse_version('1.14'):
+            reason = 'doctests are only run for numpy >= 1.14'
+            skip_doctests = True
+        elif _IS_32BIT:
+            reason = ('doctest are only run when the default numpy int is '
+                      '64 bits.')
+            skip_doctests = True
+        elif sys.platform.startswith("win32"):
+            reason = ("doctests are not run for Windows because numpy arrays "
+                      "repr is inconsistent across platforms.")
+            skip_doctests = True
+    except ImportError:
+        pass
+
+    if skip_doctests:
+        skip_marker = pytest.mark.skip(reason=reason)
+
+        for item in items:
+            if isinstance(item, DoctestItem):
+                item.add_marker(skip_marker)
+    elif not _pilutil.pillow_installed:
+        skip_marker = pytest.mark.skip(reason="pillow (or PIL) not installed!")
+        for item in items:
+            if item.name in [
+                    "sklearn.feature_extraction.image.PatchExtractor",
+                    "sklearn.feature_extraction.image.extract_patches_2d"]:
+                item.add_marker(skip_marker)
+
 
 @pytest.fixture(scope='function')
 def pyplot():