CLN avoid nested conftests (scikit-learn#27954)

neurodata · Dec 13, 2023 · 4d353c6 · 4d353c6
1 parent dc23e3f
commit 4d353c6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/conftest.py b/conftest.py
diff --git a/sklearn/conftest.py b/sklearn/conftest.py
@@ -12,7 +12,7 @@
 from _pytest.doctest import DoctestItem
 from threadpoolctl import threadpool_limits
 
-from sklearn import config_context
+from sklearn import config_context, set_config
 from sklearn._min_dependencies import PYTEST_MIN_VERSION
 from sklearn.datasets import (
     fetch_20newsgroups,
@@ -278,3 +278,11 @@ def mocked_import(name, *args, **kwargs):
         return import_orig(name, *args, **kwargs)
 
     monkeypatch.setattr(builtins, "__import__", mocked_import)
+
+
+@pytest.fixture
+def print_changed_only_false():
+    """Set `print_changed_only` to False for the duration of the test."""
+    set_config(print_changed_only=False)
+    yield
+    set_config(print_changed_only=True)  # reset to default
diff --git a/sklearn/externals/conftest.py b/sklearn/externals/conftest.py
@@ -4,4 +4,3 @@
 # using --pyargs
 def pytest_ignore_collect(path, config):
     return True
-
diff --git a/sklearn/utils/tests/conftest.py b/sklearn/utils/tests/conftest.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@
		# using --pyargs
		def pytest_ignore_collect(path, config):
		return True