Consolidate isolate and editable_mode fixture usages

Signed-off-by: Cristian Le <git@lecris.dev>

Author: LecrisUT

tests/test_editable.py

@@ -6,13 +6,12 @@
 from pathlib import Path
 
 import pytest
-from conftest import PackageInfo, VEnv, process_package
+from conftest import PackageInfo, process_package
 
 
 @pytest.mark.compile
 @pytest.mark.configure
 @pytest.mark.integration
-@pytest.mark.parametrize("isolate", [True, False], ids=["isolated", "notisolated"])
 @pytest.mark.parametrize(
     "py_pkg",
     [
@@ -30,17 +29,12 @@
     sys.version_info[:2] == (3, 9), reason="Python 3.9 not supported yet"
 )
 def test_navigate_editable(isolated, isolate, py_pkg):
-    isolate_args = ["--no-build-isolation"] if not isolate else []
-    isolated.install("pip>=23")
-    if not isolate:
-        isolated.install("scikit-build-core")
-
     if py_pkg:
         init_py = Path("python/shared_pkg/data/__init__.py")
         init_py.touch()
 
     isolated.install(
-        "-v", "--config-settings=build-dir=build/{wheel_tag}", *isolate_args, "-e", "."
+        "-v", "--config-settings=build-dir=build/{wheel_tag}", *isolate.flags, "-e", "."
     )
 
     value = isolated.execute("import shared_pkg; shared_pkg.call_c_method()")
@@ -59,17 +53,9 @@ def test_navigate_editable(isolated, isolate, py_pkg):
 @pytest.mark.compile
 @pytest.mark.configure
 @pytest.mark.integration
-@pytest.mark.parametrize(
-    ("editable", "editable_mode"), [(False, ""), (True, "redirect"), (True, "inplace")]
-)
-def test_cython_pxd(monkeypatch, tmp_path, editable, editable_mode, isolated):
-    editable_flag = ["-e"] if editable else []
-
-    config_mode_flags = []
-    if editable:
-        config_mode_flags.append(f"--config-settings=editable.mode={editable_mode}")
-    if editable_mode != "inplace":
-        config_mode_flags.append("--config-settings=build-dir=build/{wheel_tag}")
+@pytest.mark.parametrize("isolate", {False}, indirect=True)
+def test_cython_pxd(monkeypatch, tmp_path, editable, isolated, isolate):
+    isolated.install("cython")
 
     package1 = PackageInfo(
         "cython_pxd_editable/pkg1",
@@ -78,21 +64,10 @@ def test_cython_pxd(monkeypatch, tmp_path, editable, editable_mode, isolated):
     tmp_path1.mkdir()
     process_package(package1, tmp_path1, monkeypatch)
 
-    ninja = [
-        "ninja" for f in isolated.wheelhouse.iterdir() if f.name.startswith("ninja-")
-    ]
-    cmake = [
-        "cmake" for f in isolated.wheelhouse.iterdir() if f.name.startswith("cmake-")
-    ]
-
-    isolated.install("pip>23")
-    isolated.install("cython", "scikit-build-core", *ninja, *cmake)
-
     isolated.install(
         "-v",
-        *config_mode_flags,
-        "--no-build-isolation",
-        *editable_flag,
+        *isolate.flags,
+        *editable.flags,
         ".",
     )
 
@@ -105,9 +80,8 @@ def test_cython_pxd(monkeypatch, tmp_path, editable, editable_mode, isolated):
 
     isolated.install(
         "-v",
-        *config_mode_flags,
-        "--no-build-isolation",
-        *editable_flag,
+        *isolate.flags,
+        *editable.flags,
         ".",
     )
 
@@ -118,9 +92,6 @@ def test_cython_pxd(monkeypatch, tmp_path, editable, editable_mode, isolated):
 @pytest.mark.parametrize("package", {"simplest_c"}, indirect=True)
 @pytest.mark.usefixtures("package")
 def test_install_dir(isolated):
-    isolated.install("pip>=23")
-    isolated.install("scikit-build-core")
-
     settings_overrides = {
         "build-dir": "build/{wheel_tag}",
         "wheel.install-dir": "other_pkg",
@@ -141,7 +112,6 @@ def test_install_dir(isolated):
     isolated.install(
         "-v",
         *[f"--config-settings={k}={v}" for k, v in settings_overrides.items()],
-        "--no-build-isolation",
         "-e",
         ".",
     )
@@ -163,67 +133,25 @@ def test_install_dir(isolated):
     assert not failed_c_module.exists()
 
 
-def _setup_package_for_editable_layout_tests(
-    monkeypatch: pytest.MonkeyPatch,
-    tmp_path: Path,
-    editable: bool,
-    editable_mode: str,
-    isolated: VEnv,
-) -> None:
-    editable_flag = ["-e"] if editable else []
-
-    config_mode_flags = []
-    if editable:
-        config_mode_flags.append(f"--config-settings=editable.mode={editable_mode}")
-    if editable_mode != "inplace":
-        config_mode_flags.append("--config-settings=build-dir=build/{wheel_tag}")
-
-    # Use a context so that we only change into the directory up until the point where
-    # we run the editable install. We do not want to be in that directory when importing
-    # to avoid importing the source directory instead of the installed package.
-    with monkeypatch.context() as m:
-        package = PackageInfo("importlib_editable")
-        process_package(package, tmp_path, m)
-
-        assert isolated.wheelhouse
-
-        ninja = [
-            "ninja"
-            for f in isolated.wheelhouse.iterdir()
-            if f.name.startswith("ninja-")
-        ]
-        cmake = [
-            "cmake"
-            for f in isolated.wheelhouse.iterdir()
-            if f.name.startswith("cmake-")
-        ]
-
-        isolated.install("pip>23")
-        isolated.install("scikit-build-core", *ninja, *cmake)
-
-        isolated.install(
-            "-v",
-            *config_mode_flags,
-            "--no-build-isolation",
-            *editable_flag,
-            ".",
-        )
-
-
 @pytest.mark.compile
 @pytest.mark.configure
 @pytest.mark.integration
-@pytest.mark.parametrize(
-    ("editable", "editable_mode"), [(False, ""), (True, "redirect"), (True, "inplace")]
-)
-def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated):
+@pytest.mark.parametrize("package", {"importlib_editable"}, indirect=True)
+@pytest.mark.usefixtures("package")
+def test_direct_import(editable, isolated, monkeypatch, tmp_path):
     # TODO: Investigate these failures
-    if platform.system() == "Windows" and editable_mode == "inplace":
+    if platform.system() == "Windows" and editable.mode == "inplace":
         pytest.xfail("Windows fails to import the top-level extension module")
 
-    _setup_package_for_editable_layout_tests(
-        monkeypatch, tmp_path, editable, editable_mode, isolated
+    isolated.install(
+        "-v",
+        *editable.flags,
+        ".",
     )
+
+    # Exit the package path before execution
+    # TODO: Use src-layout instead
+    monkeypatch.chdir(tmp_path)
     isolated.execute("import pkg")
     isolated.execute("import pmod")
     isolated.execute("import emod")
@@ -232,32 +160,27 @@ def test_direct_import(monkeypatch, tmp_path, editable, editable_mode, isolated)
 @pytest.mark.compile
 @pytest.mark.configure
 @pytest.mark.integration
-@pytest.mark.parametrize(
-    ("editable", "editable_mode"),
-    [
-        (False, ""),
-        pytest.param(
-            True,
-            "redirect",
-            marks=pytest.mark.xfail,
-        ),
-        (True, "inplace"),
-    ],
-)
-def test_importlib_resources(monkeypatch, tmp_path, editable, editable_mode, isolated):
+@pytest.mark.parametrize("package", {"importlib_editable"}, indirect=True)
+@pytest.mark.usefixtures("package")
+def test_importlib_resources(editable, isolated, monkeypatch, tmp_path):
     if sys.version_info < (3, 9):
         pytest.skip("importlib.resources.files is introduced in Python 3.9")
 
     # TODO: Investigate these failures
-    if editable_mode == "redirect":
+    if editable.mode == "redirect":
         pytest.xfail("Redirect mode is at navigating importlib.resources.files")
-    if platform.system() == "Windows" and editable_mode == "inplace":
+    if platform.system() == "Windows" and editable.mode == "inplace":
         pytest.xfail("Windows fails to import the top-level extension module")
 
-    _setup_package_for_editable_layout_tests(
-        monkeypatch, tmp_path, editable, editable_mode, isolated
+    isolated.install(
+        "-v",
+        *editable.flags,
+        ".",
     )
 
+    # Exit the package path before execution
+    # TODO: Use src-layout instead
+    monkeypatch.chdir(tmp_path)
     isolated.execute(
         textwrap.dedent(
             """

tests/test_pyproject_pep660.py

@@ -1,6 +1,5 @@
 import sys
 import sysconfig
-import typing
 import zipfile
 from pathlib import Path
 
@@ -9,11 +8,6 @@
 from scikit_build_core.build import build_editable
 
 
-@pytest.fixture(params=["redirect", "inplace"])
-def editable_mode(request: pytest.FixtureRequest) -> str:
-    return typing.cast("str", request.param)
-
-
 # TODO: figure out why gmake is reporting no rule to make simple_pure.cpp
 @pytest.mark.compile
 @pytest.mark.configure
@@ -23,10 +17,11 @@ def editable_mode(request: pytest.FixtureRequest) -> str:
     reason="No idea why this fails on Cygwin",
 )
 @pytest.mark.parametrize("package", {"simplest_c"}, indirect=True)
+@pytest.mark.parametrize("editable", ["redirect", "inplace"], indirect=True)
 @pytest.mark.usefixtures("package")
-def test_pep660_wheel(editable_mode: str, tmp_path: Path):
+def test_pep660_wheel(editable, tmp_path: Path):
     dist = tmp_path / "dist"
-    out = build_editable(str(dist), {"editable.mode": editable_mode})
+    out = build_editable(str(dist), {"editable.mode": editable.mode})
     (wheel,) = dist.glob("simplest-0.0.1-*.whl")
     assert wheel == dist / out
 
@@ -36,9 +31,9 @@ def test_pep660_wheel(editable_mode: str, tmp_path: Path):
         with zf.open("simplest-0.0.1.dist-info/METADATA") as f:
             metadata = f.read().decode("utf-8")
 
-    assert len(file_names) == 4 if editable_mode == "redirect" else 2
+    assert len(file_names) == 4 if editable.mode == "redirect" else 2
     assert "simplest-0.0.1.dist-info" in file_names
-    if editable_mode == "redirect":
+    if editable.mode == "redirect":
         assert "simplest" in file_names
         assert "_simplest_editable.py" in file_names
     else:
@@ -54,23 +49,14 @@ def test_pep660_wheel(editable_mode: str, tmp_path: Path):
 @pytest.mark.compile
 @pytest.mark.configure
 @pytest.mark.integration
-@pytest.mark.parametrize("isolate", [True, False], ids=["isolated", "not_isolated"])
 @pytest.mark.parametrize("package", {"simplest_c"}, indirect=True)
+@pytest.mark.parametrize("editable", ["redirect", "inplace"], indirect=True)
 @pytest.mark.usefixtures("package")
-def test_pep660_pip_isolated(isolated, isolate, editable_mode: str):
-    isolate_args = ["--no-build-isolation"] if not isolate else []
-    isolated.install("pip>=23")
-    if not isolate:
-        isolated.install("scikit-build-core")
-
-    build_dir = "" if editable_mode == "inplace" else "build/{wheel_tag}"
-
+def test_pep660_pip_isolated(isolated, isolate, editable):
     isolated.install(
         "-v",
-        f"--config-settings=build-dir={build_dir}",
-        f"--config-settings=editable.mode={editable_mode}",
-        *isolate_args,
-        "-e",
+        *isolate.flags,
+        *editable.flags,
         ".",
     )
 
@@ -87,7 +73,7 @@ def test_pep660_pip_isolated(isolated, isolate, editable_mode: str):
     assert any(x.samefile(python_source) for x in locations)
 
     cmake_install = isolated.platlib.joinpath("simplest").resolve()
-    if editable_mode == "redirect":
+    if editable.mode == "redirect":
         # Second path is from the CMake install
         assert any(x.samefile(cmake_install) for x in locations)
 
@@ -106,7 +92,7 @@ def test_pep660_pip_isolated(isolated, isolate, editable_mode: str):
     else:
         ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
 
-    module_source = python_source if editable_mode == "inplace" else cmake_install
+    module_source = python_source if editable.mode == "inplace" else cmake_install
     module_file = module_source / f"_module{ext_suffix}"
 
     # Windows FindPython may produce the wrong extension