Revert "Fix importing fixtures across subfolders (spacetelescope#9545)"

This reverts commit 07f2649, reversing
changes made to a4846d5.

Author: jhunkeler

.github/workflows/ci.yml

@@ -72,7 +72,6 @@ jobs:
         - linux: py311-oldestdeps-xdist-cov
         - linux: py311-xdist
         - linux: py312-xdist
-        - linux: py312-pyargs-xdist
         # `tox` does not currently respect `requires-python` versions when creating testing environments;
         # if this breaks, add an upper pin to `requires-python` and revert this py3 to the latest working version
         - linux: py3-cov-xdist

jwst/combine_1d/tests/test_combine1d.py

@@ -205,11 +205,7 @@ def create_spec_model(npoints=10, flux=1e-9, error=1e-10, wave_range=(11, 13)):
     spec_model = datamodels.SpecModel(spec_table=otab)
 
     return spec_model
-
-
-@pytest.fixture
-def wfss_multiexposure():
-    return wfss_multi()
+        
 
 
 def test_wfss_multi_input(wfss_multiexposure):

jwst/datamodels/utils/tests/__init__.py

@@ -8,7 +8,8 @@
 from jwst.exp_to_source import multislit_to_container
 
 
-def simple_wcs_func():
+@pytest.fixture()
+def simple_wcs():
     """
     Mock a horizontal dispersion WCS with a simple callable function.
 
@@ -75,20 +76,6 @@ def return_results(*args, **kwargs):  # noqa: ARG001
     return simple_wcs_function
 
 
-@pytest.fixture
-def simple_wcs():
-    """
-    Make simple_wcs_func available as a fixture.
-
-    Returns
-    -------
-    callable
-        A function that will return mock values for RA, Dec, wave,
-        given x and y coordinates.
-    """
-    return simple_wcs_func()
-
-
 @pytest.fixture()
 def simple_wcs_transpose():
     """
@@ -192,12 +179,13 @@ def simple_wcs_function(x, y, z):  # noqa: ARG001
     return simple_wcs_function
 
 
-def mock_nirspec_fs_one_slit_function():
+@pytest.fixture()
+def mock_nirspec_fs_one_slit(simple_wcs):
     """
     Mock one slit in NIRSpec FS mode.
 
-    Returns
-    -------
+    Yields
+    ------
     SlitModel
         The mock model.
     """
@@ -215,26 +203,12 @@ def mock_nirspec_fs_one_slit_function():
     model.source_type = "EXTENDED"
 
     model.meta.wcsinfo.dispersion_direction = 1
-    model.meta.wcs = simple_wcs_func()
+    model.meta.wcs = simple_wcs
 
     model.data = np.arange(50 * 50, dtype=float).reshape((50, 50))
     model.var_poisson = model.data * 0.02
     model.var_rnoise = model.data * 0.02
     model.var_flat = model.data * 0.05
-    return model
-
-
-@pytest.fixture
-def mock_nirspec_fs_one_slit():
-    """
-    Make mock_nirspec_fs_one_slit_function available as a fixture.
-
-    Yields
-    ------
-    SlitModel
-        The mock model.
-    """
-    model = mock_nirspec_fs_one_slit_function()
     yield model
     model.close()
 
@@ -476,12 +450,13 @@ def mock_miri_ifu(simple_wcs_ifu):
     model.close()
 
 
-def mock_nis_wfss_l2():
+@pytest.fixture()
+def mock_niriss_wfss_l2(mock_nirspec_fs_one_slit):
     """
     Mock 3 slits in NIRISS WFSS mode, level 3 style.
 
-    Returns
-    -------
+    Yields
+    ------
     MultiSlitModel
         The mock model.
     """
@@ -499,29 +474,13 @@ def mock_nis_wfss_l2():
     model.meta.observation.exposure_number = "5"
     model.meta.exposure.type = "NIS_WFSS"
 
-    slit0 = mock_nirspec_fs_one_slit_function()
-
     nslit = 3
     for i in range(nslit):
-        slit = slit0.copy()
+        slit = mock_nirspec_fs_one_slit.copy()
         slit.name = str(i + 1)
         slit.meta.exposure.type = "NIS_WFSS"
         model.slits.append(slit)
 
-    return model
-
-
-@pytest.fixture
-def mock_niriss_wfss_l2():
-    """
-    Make mock_nis_wfss_l2 available as a fixture.
-
-    Yields
-    ------
-    MultiSlitModel
-        The mock model.
-    """
-    model = mock_nis_wfss_l2()
     yield model
     model.close()
 

jwst/datamodels/utils/tests/wfss_helpers.py

@@ -8,7 +8,7 @@
 from jwst.datamodels.utils.tests.wfss_helpers import wfss_multi
 
 from jwst.stpipe import Step
-from jwst.extract_1d.tests.conftest import mock_nis_wfss_l2
+from jwst.extract_1d.tests.conftest import mock_niriss_wfss_l2, mock_nirspec_fs_one_slit, simple_wcs
 
 
 INPUT_WFSS = "mock_wfss_cal.fits"