diff --git a/sklearn/conftest.py b/sklearn/conftest.py index b6bde190ad3fb..821b9c2044dbc 100644 --- a/sklearn/conftest.py +++ b/sklearn/conftest.py @@ -19,10 +19,7 @@ from sklearn.datasets import fetch_kddcup99 from sklearn.datasets import fetch_olivetti_faces from sklearn.datasets import fetch_rcv1 - - -# This plugin is necessary to define the random seed fixture -pytest_plugins = ("sklearn.tests.random_seed",) +from sklearn.tests import random_seed if parse_version(pytest.__version__) < parse_version(PYTEST_MIN_VERSION): @@ -249,3 +246,7 @@ def pytest_configure(config): matplotlib.use("agg") except ImportError: pass + + # Register global_random_seed plugin if it is not already registered + if not config.pluginmanager.hasplugin("sklearn.tests.random_seed"): + config.pluginmanager.register(random_seed)