tests: use filelock instead of config

Signed-off-by: Henry Schreiner <henryfs@princeton.edu>

Author: henryiii

.distro/python-scikit-build-core.spec

@@ -22,7 +22,6 @@ BuildRequires:  ninja-build
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  git
-BuildRequires:  python3-hatch-vcs
 
 %global _description %{expand:
 A next generation Python CMake adapter and Python API for plugins

.github/workflows/ci.yml

@@ -187,7 +187,7 @@ jobs:
 
       - name: Install min requirements
         run: |
-          uv pip install -e. --group=test --resolution=lowest-direct --system
+          uv pip install -e. --group=test-pybind11 --resolution=lowest-direct --system
 
       - name: Setup CMake 3.15
         uses: jwlawson/actions-setup-cmake@v2.0
@@ -223,7 +223,7 @@ jobs:
         run: python3.13t -m venv /venv
 
       - name: Install deps
-        run: /venv/bin/pip install -e . --group=test ninja pybind11
+        run: /venv/bin/pip install -e . --group=test-pybind11 ninja
 
       - name: Test package
         run: /venv/bin/pytest
@@ -312,7 +312,7 @@ jobs:
           persist-credentials: false
 
       - name: Install
-        run: python -m pip install . --group=test
+        run: python -m pip install . --group=test-pybind11
 
       - name: Test package
         run: >-

pyproject.toml

@@ -77,6 +77,7 @@ hatch.scikit-build = "scikit_build_core.hatch.hooks"
 test = [
     "build >=0.8",
     "cattrs >=22.2.0",
+    "filelock >=3.8.0",
     "hatchling >=1.24",
     "hatch-vcs >=0.4",
     "pip>=23; python_version<'3.13'",

tests/conftest.py

@@ -14,6 +14,7 @@
 from typing import Any, Literal, overload
 
 import virtualenv as _virtualenv
+from filelock import FileLock
 
 if sys.version_info < (3, 11):
     import tomli as tomllib
@@ -37,28 +38,34 @@
 VIRTUALENV_VERSION = Version(metadata.version("virtualenv"))
 
 
-def pytest_configure(config) -> None:
-    if hasattr(config, "workerinput"):
-        return  # Running in pytest-xdist worker
-
-    wheelhouse = config.cache.mkdir("wheelhouse")
-
-    subprocess.run(
-        [
-            sys.executable,
-            "-m",
-            "pip",
-            "wheel",
-            "--no-build-isolation",
-            "--wheel-dir",
-            str(wheelhouse),
-            f"{BASE}",
-        ],
-        check=True,
-    )
+@pytest.fixture(scope="session")
+def pep518_wheelhouse(pytestconfig: pytest.Config) -> Path:
+    wheelhouse = pytestconfig.cache.mkdir("wheelhouse")
+
+    main_lock = FileLock(wheelhouse / "main.lock")
+    with main_lock:
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "pip",
+                "wheel",
+                "--wheel-dir",
+                str(wheelhouse),
+                "--no-build-isolation",
+                f"{BASE}",
+            ],
+            check=True,
+            capture_output=True,
+            text=True,
+        )
 
-    if not all(list(wheelhouse.glob(f"{p}*.whl")) for p in download_wheels.WHEELS):
-        download_wheels.prepare(wheelhouse)
+    wheels_lock = FileLock(wheelhouse / "wheels.lock")
+    with wheels_lock:
+        if not all(list(wheelhouse.glob(f"{p}*.whl")) for p in download_wheels.WHEELS):
+            download_wheels.prepare(wheelhouse)
+
+    return wheelhouse
 
 
 class VEnv:
@@ -152,10 +159,9 @@ def prepare_no_build_isolation(self) -> None:
 
 
 @pytest.fixture
-def isolated(tmp_path: Path, pytestconfig: pytest.Config) -> VEnv:
+def isolated(tmp_path: Path, pep518_wheelhouse: Path) -> VEnv:
     path = tmp_path / "venv"
-    wheelhouse = pytestconfig.cache.mkdir("wheelhouse").resolve()
-    return VEnv(path, wheelhouse=wheelhouse)
+    return VEnv(path, wheelhouse=pep518_wheelhouse)
 
 
 @pytest.fixture
@@ -345,7 +351,7 @@ def pytest_collection_modifyitems(items: list[pytest.Item]) -> None:
             item.add_marker(pytest.mark.network)
 
 
-def pytest_report_header(config: pytest.Config) -> str:
+def pytest_report_header() -> str:
     with BASE.joinpath("pyproject.toml").open("rb") as f:
         pyproject = tomllib.load(f)
     project = pyproject.get("project", {})
@@ -357,9 +363,6 @@ def pytest_report_header(config: pytest.Config) -> str:
     interesting_packages = {Requirement(p).name for p in pkgs}
     interesting_packages.add("pip")
 
-    wheelhouse = config.cache.mkdir("wheelhouse")
-    pkgs = wheelhouse.glob("*.whl")
-
     valid = []
     for package in sorted(interesting_packages):
         with contextlib.suppress(ModuleNotFoundError):
@@ -368,6 +371,5 @@ def pytest_report_header(config: pytest.Config) -> str:
     lines = [
         f"installed packages of interest: {reqs}",
         f"sysconfig platform: {sysconfig.get_platform()}",
-        f"wheelhouse: {' '.join('-'.join(p.name.split('-')[:2]) for p in pkgs)}",
     ]
     return "\n".join(lines)

tests/utils/download_wheels.py

@@ -18,7 +18,6 @@
     "cython",
     "hatchling",
     "pip",
-    "pybind11",
     "setuptools",
     "virtualenv",
     "wheel",