Disable build isolation

Author: Schamper

.github/workflows/dissect-ci.yml

@@ -16,7 +16,6 @@ jobs:
       run-benchmarks: true
 
   build-native:
-    name: Build native wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -32,37 +31,35 @@ jobs:
       - run: curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
 
       - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
 
       - run: python -m pip install cibuildwheel==2.23.2
 
       - run: python -m cibuildwheel --output-dir dist
         env:
           CIBW_ARCHS_LINUX: ${{ runner.arch == 'X64' && 'auto ppc64le s390x' || 'auto armv7l' }}
           CIBW_BEFORE_ALL_LINUX: curl -sSf https://sh.rustup.rs | sh -s -- -y
-          CIBW_BEFORE_ALL_WINDOWS: rustup target add i686-pc-windows-msvc
+          CIBW_BEFORE_ALL_WINDOWS: ${{ runner.arch == 'X64' && 'rustup target add i686-pc-windows-msvc' || '' }}
           # Manually install setuptools-rust to enable building native wheels
           CIBW_BEFORE_BUILD: >
-            python -m pip install -U setuptools-rust
-          CIBW_BUILD_FRONTEND: build
-          CIBW_ENVIRONMENT: PATH="$HOME/.cargo/bin:$PATH"
-          CIBW_ENVIRONMENT_WINDOWS: PATH="$UserProfile\.cargo\bin;$PATH"
-          # Use abi3audit to catch issues with Limited API wheels
-          CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
-            auditwheel repair -w {dest_dir} {wheel} &&
-            pipx run abi3audit --strict --report {wheel}
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} &&
-            pipx run abi3audit --strict --report {wheel}
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >
-            copy {wheel} {dest_dir} &&
-            pipx run abi3audit --strict --report {wheel}
+            python -m pip install -U setuptools>=77.0.0 setuptools_scm[toml]>=6.4.0 setuptools-rust
+          CIBW_BUILD_FRONTEND: "build; args: --no-isolation"
+          CIBW_CONFIG_SETTINGS: "--build-option=--py-limited-api=cp39"
+          CIBW_ENABLE: pypy
+          CIBW_ENVIRONMENT_LINUX: 'PATH="$HOME/.cargo/bin:$PATH"'
+          CIBW_ENVIRONMENT_MACOS: 'MACOSX_DEPLOYMENT_TARGET=10.12'
+          CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
+          CIBW_SKIP: '*-musllinux_i686'
           # Run tests
           CIBW_TEST_REQUIRES: tox
-          CIBW_TEST_COMMAND: tox -c {package}/tox.ini --installpkg {wheel}
+          CIBW_TEST_COMMAND: tox -e native -c {package}/tox.ini --installpkg {wheel}
+
+      - run: pip install abi3audit && abi3audit --strict --report dist/*-abi3-*.whl
 
       - uses: actions/upload-artifact@v4
         with:
-          name: packages
+          name: packages-native-${{ matrix.os }}
           path: dist/*
           retention-days: 1
 
@@ -76,7 +73,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: packages
+          pattern: packages-*
           path: dist/
       # According to the documentation, it automatically looks inside the `dist/` folder for packages.
       - name: Publish package distributions to Pypi

tests/conftest.py

@@ -3,17 +3,40 @@
 import pytest
 
 
+def pytest_addoption(parser: pytest.Parser) -> None:
+    parser.addoption(
+        "--force-native", action="store_true", default=False, help="run native tests, not allowing fallbacks"
+    )
+
+
 @pytest.fixture(scope="session", params=[True, False], ids=["native", "python"])
-def lz4(request: pytest.FixtureRequest) -> ModuleType:
+def _native(request: pytest.FixtureRequest, pytestconfig: pytest.Config) -> ModuleType:
     if request.param:
-        return pytest.importorskip("dissect.util._native", reason="_native module is unavailable").compression.lz4
+        try:
+            import dissect.util._native
+        except ImportError:
+            (pytest.fail if pytestconfig.getoption("--force-native") else pytest.skip)("_native module is unavailable")
+        else:
+            return dissect.util._native
 
-    return pytest.importorskip("dissect.util.compression.lz4")
+    return None
 
 
-@pytest.fixture(scope="session", params=[True, False], ids=["native", "python"])
-def lzo(request: pytest.FixtureRequest) -> ModuleType:
-    if request.param:
-        return pytest.importorskip("dissect.util._native", reason="_native module is unavailable").compression.lzo
+@pytest.fixture(scope="session")
+def lz4(_native: ModuleType) -> ModuleType:
+    if _native:
+        return _native.compression.lz4
+
+    import dissect.util.compression.lz4
+
+    return dissect.util.compression.lz4
+
+
+@pytest.fixture(scope="session")
+def lzo(_native: ModuleType) -> ModuleType:
+    if _native:
+        return _native.compression.lzo
+
+    import dissect.util.compression.lzo
 
-    return pytest.importorskip("dissect.util.compression.lzo")
+    return dissect.util.compression.lzo

tox.ini

@@ -17,7 +17,6 @@ deps =
 config_settings_build_wheel = --build-option=--py-limited-api=cp39
 
 [testenv]
-package = wheel
 deps =
     pytest
     pytest-cov
@@ -27,6 +26,13 @@ commands =
     coverage report
     coverage xml
 
+[testenv:native]
+package = wheel
+deps =
+    pytest
+commands =
+    pytest --basetemp="{envtmpdir}" --import-mode="append" --force-native {posargs:--color=yes -v tests}
+
 [testenv:benchmark]
 deps =
     pytest
@@ -35,7 +41,7 @@ deps =
 passenv =
     CODSPEED_ENV
 commands =
-    pytest --basetemp="{envtmpdir}" {posargs:--color=yes -v tests}
+    pytest --basetemp="{envtmpdir}" --import-mode="append" {posargs:--color=yes -v tests}
 
 [testenv:build]
 package = skip