Splitting up conftest to make both pytest happy and pick up the configuration properly with tox

Author: bsipocz

astroquery/conftest.py

@@ -0,0 +1,20 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+# Keep the project level fixtures in this file, keeping them in root level
+# conftest causes issues with pytest 9.1+
+
+import os
+from pathlib import Path
+
+import pytest
+
+
+@pytest.fixture(scope='function')
+def tmp_cwd(tmp_path):
+    """Perform test in a pristine temporary working directory."""
+    old_dir = Path.cwd()
+    os.chdir(tmp_path)
+    try:
+        yield tmp_path
+    finally:
+        os.chdir(old_dir)

conftest.py

@@ -1,7 +1,9 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-import os
-from pathlib import Path
+# Keep basic config here, so both tox and directly run pytest works as expected.
+# Keep the fixtures one layer down for global fixtures and more layer down
+# for more specific scopes.
+
 import sys
 
 from astropy.utils import minversion
@@ -59,17 +61,6 @@ def pytest_addoption(parser):
     )
 
 
-@pytest.fixture(scope='function')
-def tmp_cwd(tmp_path):
-    """Perform test in a pristine temporary working directory."""
-    old_dir = Path.cwd()
-    os.chdir(tmp_path)
-    try:
-        yield tmp_path
-    finally:
-        os.chdir(old_dir)
-
-
 def pytest_runtestloop(session):
     if sys.platform == 'win32':
         session.add_marker(pytest.mark.filterwarnings(