From 63d127fe7f9a0b60424afdee513e130785639e44 Mon Sep 17 00:00:00 2001 From: richard Date: Sun, 28 Jan 2024 22:52:29 -0500 Subject: [PATCH 1/2] CI: autouse add_doctest_imports --- pandas/conftest.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 94805313ccfc1..409970c673fe9 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -190,10 +190,6 @@ def pytest_collection_modifyitems(items, config) -> None: if is_doctest: for item in items: - # autouse=True for the add_doctest_imports can lead to expensive teardowns - # since doctest_namespace is a session fixture - item.add_marker(pytest.mark.usefixtures("add_doctest_imports")) - for path, message in ignored_doctest_warnings: ignore_doctest_warning(item, path, message) @@ -250,7 +246,10 @@ def pytest_collection_modifyitems(items, config) -> None: ) -@pytest.fixture +# ---------------------------------------------------------------- +# Autouse fixtures +# ---------------------------------------------------------------- +@pytest.fixture(autouse=True) def add_doctest_imports(doctest_namespace) -> None: """ Make `np` and `pd` names available for doctests. @@ -259,9 +258,6 @@ def add_doctest_imports(doctest_namespace) -> None: doctest_namespace["pd"] = pd -# ---------------------------------------------------------------- -# Autouse fixtures -# ---------------------------------------------------------------- @pytest.fixture(autouse=True) def configure_tests() -> None: """ From 2c11a7975c6c4ce31838dfede8e618b36e26cce7 Mon Sep 17 00:00:00 2001 From: Richard Shadrach Date: Mon, 29 Jan 2024 16:20:04 -0500 Subject: [PATCH 2/2] add ref --- pandas/conftest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/conftest.py b/pandas/conftest.py index 409970c673fe9..c70edeb6ad8ec 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -249,6 +249,10 @@ def pytest_collection_modifyitems(items, config) -> None: # ---------------------------------------------------------------- # Autouse fixtures # ---------------------------------------------------------------- + + +# https://github.com/pytest-dev/pytest/issues/11873 +# Would like to avoid autouse=True, but cannot as of pytest 8.0.0 @pytest.fixture(autouse=True) def add_doctest_imports(doctest_namespace) -> None: """