Merge pull request astropy#3614 from bsipocz/MAINT_fix_pytest_91

MAINT: fixing pytest9.1 incompatibilities

Author: bsipocz

astroquery/besancon/tests/test_besancon.py

@@ -35,8 +35,8 @@ def data_path(filename):
 
 
 @pytest.mark.parametrize(('filename', 'length', 'ncols', 'd1', 'mv1'),
-                         zip(DATA_FILES, (13, 6), (18, 24), (0.091, 0.111),
-                             (10.20, 9.70)))
+                         list(zip(DATA_FILES, (13, 6), (18, 24), (0.091, 0.111),
+                                  (10.20, 9.70))))
 def test_reader(filename, length, ncols, d1, mv1):
     besancon_model = data_path(filename)
     with open(besancon_model, 'r') as f:

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)

astroquery/esasky/tests/test_esasky_remote.py

@@ -68,12 +68,12 @@ def test_esasky_query_ids_spectra(self):
         assert "1342246640" in result["HERSCHEL"].columns["observation_id"]
 
     @pytest.mark.parametrize("mission, obsid",
-                             zip(["SUZAKU", "ISO-IR", "Chandra", "XMM-OM-OPTICAL",
-                                  "XMM", "XMM-OM-UV", "HST-IR", "Herschel",
-                                  "Spitzer", "HST-UV", "HST-OPTICAL", "INTEGRAL"],
-                                 ["100001010", "01500403", "21171", "0852000101",
-                                  "0851180201", "0851180201", "n3tr01c3q", "1342247257",
-                                  "30002561-25100", "hst_07553_3h_wfpc2_f160bw_pc", "ocli05leq", "88600210001"]))
+                             list(zip(["SUZAKU", "ISO-IR", "Chandra", "XMM-OM-OPTICAL",
+                                       "XMM", "XMM-OM-UV", "HST-IR", "Herschel",
+                                       "Spitzer", "HST-UV", "HST-OPTICAL", "INTEGRAL"],
+                                      ["100001010", "01500403", "21171", "0852000101",
+                                       "0851180201", "0851180201", "n3tr01c3q", "1342247257",
+                                       "30002561-25100", "hst_07553_3h_wfpc2_f160bw_pc", "ocli05leq", "88600210001"])))
     def test_esasky_get_images_obs_id(self, tmp_path, mission, obsid):
         result = ESASky.get_images(observation_ids=obsid,
                                    missions=mission, download_dir=tmp_path)
@@ -89,10 +89,10 @@ def test_esasky_get_images_obs_id(self, tmp_path, mission, obsid):
                 hdu_list.close()
 
     @pytest.mark.parametrize("mission, observation_id",
-                             zip(["ISO-IR", "Chandra", "IUE", "XMM-NEWTON",
-                                  "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"],
-                                 ["02101201", "1005", "LWR13178", "0001730201",
-                                  "ibh706cqq", "1342253595", "z1ax0102t", "oeik2s020"]))
+                             list(zip(["ISO-IR", "Chandra", "IUE", "XMM-NEWTON",
+                                       "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"],
+                                      ["02101201", "1005", "LWR13178", "0001730201",
+                                       "ibh706cqq", "1342253595", "z1ax0102t", "oeik2s020"])))
     def test_esasky_get_spectra_obs_id(self, tmp_path, mission, observation_id):
         result = ESASky.get_spectra(observation_ids=observation_id,
                                     missions=mission, download_dir=tmp_path)
@@ -135,8 +135,9 @@ def test_esasky_get_images_for_erosita(self, tmp_path):
 
     @pytest.mark.bigdata
     @pytest.mark.parametrize('mission, position',
-                             zip(['JWST-MID-IR', 'JWST-NEAR-IR'],
-                                 ['340.50123388127435 -69.17904779241904', '225.6864099965157 -3.0315781490149467']))
+                             list(zip(['JWST-MID-IR', 'JWST-NEAR-IR'],
+                                      ['340.50123388127435 -69.17904779241904',
+                                       '225.6864099965157 -3.0315781490149467'])))
     def test_esasky_get_images_jwst(self, tmp_path, mission, position):
         result = ESASky.get_images(position=position, missions=mission, download_dir=tmp_path)
         assert tmp_path.stat().st_size

astroquery/linelists/cdms/tests/test_cdms_remote.py

@@ -238,7 +238,7 @@ def test_remote_all_species():
 class TestRegressionAllCats:
     species_table = CDMS.get_species_table(write_new_species_cache=False)
 
-    @pytest.mark.parametrize('row', species_table)
+    @pytest.mark.parametrize('row', list(species_table))
     def test_regression_allcats(self, row):
         """
         Expensive test - try all the molecules

astroquery/linelists/jplspec/tests/test_jplspec_remote.py

@@ -239,7 +239,7 @@ class TestRegressionAllMolecules:
     """Test that we can get each molecule in JPL database"""
     species_table = JPLSpec.get_species_table()
 
-    @pytest.mark.parametrize('row', species_table)
+    @pytest.mark.parametrize('row', list(species_table))
     def test_regression_all_molecules(self, row):
         """
         Expensive test - try all the molecules
@@ -254,5 +254,5 @@ def test_regression_all_molecules(self, row):
             # N2O = 44009 is just not there
             pytest.skip("Skipping O2 due to masked QNs")
         tbl = JPLSpec.get_molecule(mol_id)
-        assert isinstance(tbl, Table)
+        assert isinstance(tbl, (Table,))
         assert len(tbl) > 0

astroquery/skyview/tests/test_skyview_remote.py

@@ -36,7 +36,7 @@ def setup_class(cls):
 
     @pytest.mark.parametrize(('survey',
                               'survey_data'),
-                             zip(survey_dict.keys(), survey_dict.values()))
+                             list(zip(survey_dict.keys(), survey_dict.values())))
     def test_survey(self, survey, survey_data):
         # The print should help discover changes
         print("Survey: {0} \n Canned reference return: {1} \n"

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(