From 08e2b759987a778d44686a6ef061d8a6f2eda305 Mon Sep 17 00:00:00 2001 From: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Date: Wed, 11 Dec 2024 22:50:53 +0000 Subject: [PATCH 1/5] adds aarch64 wheels --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ba10b77..b169ef8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,6 +139,11 @@ jobs: run: conda install -y openblas pkgconfig - name: Build wheels + env: + CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" + CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" + CIBW_ARCHS_MACOS: x86_64 universal2 + CIBW_ARCHS_LINUX: auto aarch64 uses: pypa/cibuildwheel@v2.22.0 - uses: actions/upload-artifact@v4 From 7b58c48bb10a96ea94ad6702581169b198a3c72d Mon Sep 17 00:00:00 2001 From: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Date: Thu, 12 Dec 2024 01:20:32 +0000 Subject: [PATCH 2/5] removing some CI env vars and updating pyproject.toml for python>=3.9 --- .github/workflows/build.yml | 2 -- pyproject.toml | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b169ef8a..daa6f086 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,8 +140,6 @@ jobs: - name: Build wheels env: - CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" - CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" CIBW_ARCHS_MACOS: x86_64 universal2 CIBW_ARCHS_LINUX: auto aarch64 uses: pypa/cibuildwheel@v2.22.0 diff --git a/pyproject.toml b/pyproject.toml index 8f2947cd..ef145bb3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,7 @@ [build-system] build-backend = 'mesonpy' requires = [ - "numpy >= 2.0.0; python_version > '3.8'", - "oldest-supported-numpy; python_version <= '3.8'", + "numpy >= 2.0.0, "meson-python" ] @@ -11,7 +10,7 @@ name = 'scs' version = "3.2.7" description = 'Splitting conic solver' readme = 'README.md' -requires-python = '>=3.7' +requires-python = '>=3.9' license = {file = 'LICENSE'} authors = [ {name = "Brendan O'Donoghue", email = "bodonoghue85@gmail.com"}] From bab16fcb28a2728c01da1b6f52754f0092b4da71 Mon Sep 17 00:00:00 2001 From: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Date: Thu, 12 Dec 2024 01:23:46 +0000 Subject: [PATCH 3/5] adding missing quote --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ef145bb3..08362325 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = 'mesonpy' requires = [ - "numpy >= 2.0.0, + "numpy >= 2.0.0", "meson-python" ] From d7c1a50f8bc377f5fb55d5151bd557fe08ea3a25 Mon Sep 17 00:00:00 2001 From: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:01:50 +0000 Subject: [PATCH 4/5] adding build wheels only on push, similar to cvxpy --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daa6f086..24994a8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,6 +115,7 @@ jobs: matrix: # macos-13 is an intel runner, macos-14 is apple silicon os: [ubuntu-latest, macos-14, windows-latest, macos-13] + arch: [x86_64 universal2, auto aarch64] steps: - uses: actions/checkout@v4 @@ -139,6 +140,7 @@ jobs: run: conda install -y openblas pkgconfig - name: Build wheels + if: ${{github.event_name == 'push'}} env: CIBW_ARCHS_MACOS: x86_64 universal2 CIBW_ARCHS_LINUX: auto aarch64 From 77012c27fa5e846e63e35b5a72b73709ef3878de Mon Sep 17 00:00:00 2001 From: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Date: Thu, 2 Jan 2025 20:08:03 +0000 Subject: [PATCH 5/5] adding other CIBW env vars --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24994a8e..fa367cce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,7 +115,6 @@ jobs: matrix: # macos-13 is an intel runner, macos-14 is apple silicon os: [ubuntu-latest, macos-14, windows-latest, macos-13] - arch: [x86_64 universal2, auto aarch64] steps: - uses: actions/checkout@v4 @@ -142,6 +141,8 @@ jobs: - name: Build wheels if: ${{github.event_name == 'push'}} env: + CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" + CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" CIBW_ARCHS_MACOS: x86_64 universal2 CIBW_ARCHS_LINUX: auto aarch64 uses: pypa/cibuildwheel@v2.22.0