From 20e388d1bb4f3bd14ea8138644a965873dac9310 Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Thu, 9 May 2024 09:23:55 +0200 Subject: [PATCH 1/2] add m1/m2 apple release --- .github/workflows/python_packages.yml | 46 +++++++++++++++++++++------ 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python_packages.yml b/.github/workflows/python_packages.yml index 20103d31..1bc13aa4 100644 --- a/.github/workflows/python_packages.yml +++ b/.github/workflows/python_packages.yml @@ -22,7 +22,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: @@ -48,7 +48,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: @@ -72,7 +72,7 @@ jobs: python-version: '3.8' - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: @@ -104,7 +104,7 @@ jobs: dir "C:/vcpkg/installed/x64-windows/bin" - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: @@ -138,15 +138,43 @@ jobs: dir "C:/vcpkg/installed/x86-windows/bin" - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 + + - uses: actions/upload-artifact@v3 + with: + path: ./wheelhouse/*.whl + + build_macos_arm64_wheels: + name: Build wheels on macos-14 (arm64) + runs-on: macos-14 + env: + SQLite3_ROOT: /usr/local/opt/sqlite + CIBW_SKIP: cp27-* cp35-* cp36-* + CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" + + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-python@v3 + name: Install Python + with: + python-version: '3.8' + + - name: Install Deps + run: | + brew install sqlite3 + pip install setuptools scikit-build wheel cmake + + - name: Build wheels + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl build_macos_wheels: - name: Build wheels on macos-latest - runs-on: macos-latest + name: Build wheels on macos-13 + runs-on: macos-13 env: SQLite3_ROOT: /usr/local/opt/sqlite CIBW_SKIP: cp27-* cp35-* cp36-* @@ -166,7 +194,7 @@ jobs: pip install setuptools scikit-build wheel cmake - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.17.0 - uses: actions/upload-artifact@v3 with: @@ -196,7 +224,7 @@ jobs: path: dist/*.tar.gz upload_pypi: - needs: [build_windows_wheels, build_linux_wheels_manylinux_2_28, build_linux_wheels_manylinux2014, build_linux_wheels_musllinux_x86_64, build_macos_wheels, build_sdist] + needs: [build_windows_wheels, build_linux_wheels_manylinux_2_28, build_linux_wheels_manylinux2014, build_linux_wheels_musllinux_x86_64, build_macos_wheels, build_macos_arm64_wheels, build_sdist] runs-on: ubuntu-latest if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') steps: From 332359836ae8fcdef4a3b5648332ec04a6cf3142 Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Thu, 9 May 2024 09:38:33 +0200 Subject: [PATCH 2/2] add m1/m2 apple release --- .github/workflows/python_packages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python_packages.yml b/.github/workflows/python_packages.yml index 1bc13aa4..41cdcc92 100644 --- a/.github/workflows/python_packages.yml +++ b/.github/workflows/python_packages.yml @@ -148,7 +148,7 @@ jobs: name: Build wheels on macos-14 (arm64) runs-on: macos-14 env: - SQLite3_ROOT: /usr/local/opt/sqlite + SQLite3_ROOT: /opt/homebrew/opt/sqlite CIBW_SKIP: cp27-* cp35-* cp36-* CIBW_TEST_COMMAND: python -c "import pygeodiff; pygeodiff.GeoDiff().version()" @@ -164,6 +164,8 @@ jobs: run: | brew install sqlite3 pip install setuptools scikit-build wheel cmake + + ls -la /opt/homebrew - name: Build wheels uses: pypa/cibuildwheel@v2.17.0