From 8e4df2321511f9576397e79b5a8cb842284221f4 Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Fri, 13 Sep 2024 07:53:08 +0100 Subject: [PATCH 1/2] Remove global declaration of osx arch --- .github/workflows/build-wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 0820c84..8d0d3af 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -27,7 +27,6 @@ jobs: BUILD_COMMIT: "v0.14.2" # or a specific version, e.g., v0.13.1 CIBW_BUILD: ${{ matrix.python }}-* CIBW_ARCHS_LINUX: "x86_64 aarch64" - CIBW_ARCHS_MACOS: "arm64" # No support for pypy, musl, Win32 for 3.10+ # Skip musl for 3.8 and 3.9 since no upstream wheels CIBW_SKIP: "pp* *-win32 cp38-musllinux* cp39-musllinux* *musllinux_aarch64*" @@ -63,6 +62,7 @@ jobs: package-dir: statsmodels env: CIBW_BEFORE_BUILD: 'git submodule foreach git checkout ${{ env.BUILD_COMMIT }}' + CIBW_ARCHS_MACOS: "arm64" - name: Build wheels (MacOS x86_64) if: matrix.os == 'macos-13' From 9e62be69735261aaf4b164c68e0721235f7a371f Mon Sep 17 00:00:00 2001 From: Kevin Sheppard Date: Fri, 13 Sep 2024 07:54:01 +0100 Subject: [PATCH 2/2] Move common command to be shared --- .github/workflows/build-wheels.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 8d0d3af..b812adf 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -29,6 +29,7 @@ jobs: CIBW_ARCHS_LINUX: "x86_64 aarch64" # No support for pypy, musl, Win32 for 3.10+ # Skip musl for 3.8 and 3.9 since no upstream wheels + CIBW_BEFORE_BUILD: 'git submodule foreach git checkout ${{ env.BUILD_COMMIT }}' CIBW_SKIP: "pp* *-win32 cp38-musllinux* cp39-musllinux* *musllinux_aarch64*" CIBW_TEST_REQUIRES: pytest pytest-xdist CIBW_TEST_COMMAND: python -c "import statsmodels; statsmodels.test(['--skip-examples','--skip-slow','-n','2'], exit=True)" @@ -61,7 +62,6 @@ jobs: output-dir: wheelhouse package-dir: statsmodels env: - CIBW_BEFORE_BUILD: 'git submodule foreach git checkout ${{ env.BUILD_COMMIT }}' CIBW_ARCHS_MACOS: "arm64" - name: Build wheels (MacOS x86_64) @@ -71,7 +71,6 @@ jobs: output-dir: wheelhouse package-dir: statsmodels env: - CIBW_BEFORE_BUILD: 'git submodule foreach git checkout ${{ env.BUILD_COMMIT }}' CIBW_ARCHS_OSX: "x86_64" - name: Build Pyodide wheel @@ -81,7 +80,6 @@ jobs: output-dir: wheelhouse package-dir: statsmodels env: - CIBW_BEFORE_BUILD: 'git submodule foreach git checkout ${{ env.BUILD_COMMIT }}' CIBW_PLATFORM: pyodide - name: Setup Upload Variables