simplifying cibuildwheel env variables

dfm · Jul 31, 2023 · 363be71 · 363be71
1 parent 75ace06
commit 363be71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,7 @@
 cirrus_wheels_macos_arm64_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+    image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+
   matrix:
     - env:
        CIBW_BUILD: cp39-* cp310-*

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,6 @@ jobs:
         buildplat:
         - [ubuntu-22.04, manylinux, x86_64]
         - [macos-latest, macosx, x86_64]
-        - [macos-latest, macosx, arm64]
         - [windows-2019, win, AMD64]
         python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"]]
     steps:
@@ -34,9 +33,6 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}*
           CIBW_ARCHS: ${{ matrix.buildplat[2] }}
-          CIBW_ENVIRONMENT_PASS_LINUX: RUNNER_OS
-          CIBW_TEST_COMMAND_LINUX: "SPS_HOME={project}/src/fsps/libfsps python {project}/tests/simple.py"
-          SPS_HOME: ${{ github.workspace }}/src/fsps/libfsps
       - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl

diff --git a/pyproject.toml b/pyproject.toml
@@ -43,3 +43,4 @@ write_to = "src/fsps/fsps_version.py"
 [tool.cibuildwheel]
 skip = "cp36-* *-win32 *-manylinux_i686 pp*"
 test-command = "python {project}/tests/simple.py"
+environment = {SPS_HOME = "$(pwd)/src/fsps/libfsps"}