From 09dc1f6eece25b15e9bd946cd89cf3e883acd948 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Feb 2025 09:13:15 +0100 Subject: [PATCH 1/6] Update build-and-deploy.yml --- .github/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index a442558..d0358b5 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-14, macos-13] + os: [ubuntu-latest, ubuntu-24.04-arm, ubuntu-22.04-arm windows-latest, macos-15, macos-13] steps: - uses: actions/checkout@v4 From 995a638deee316a6a52dbe91f2d01aaf937dc0eb Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Feb 2025 09:14:20 +0100 Subject: [PATCH 2/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 453157e..310ac11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ filterwarnings = [ ] [tool.cibuildwheel] -archs = ["auto64"] # 64-bit only +archs = ["auto"] skip = "pp* *musllinux* cp37-* cp38-* cp313-*" # Build CPython 3.9 - 3.12 before-test = "pip install -r requirements_test.txt" test-command = "pytest {project}/tests" From 3bd3a081e50779cff4a1da60bf9c355cf9d8287e Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Feb 2025 09:17:27 +0100 Subject: [PATCH 3/6] Update build-and-deploy.yml --- .github/workflows/build-and-deploy.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index d0358b5..9cbea61 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -14,12 +14,20 @@ concurrency: jobs: build_wheels: - name: Build wheels on ${{ matrix.os }} + name: Build wheels on ${{ matrix.os }}-${{ matrix.arch }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, ubuntu-22.04-arm windows-latest, macos-15, macos-13] + os: [ ubuntu-latest, macos-13, windows-latest ] # Use standard runner labels + arch: [ x86_64 ] # Default arch for ubuntu and macos + include: + - os: ubuntu-24.04-arm # Build ARM64 on Ubuntu + arch: aarch64 + - os: ubuntu-22.04-arm # Build ARM64 on Ubuntu + arch: aarch64 + - os: macos-15 # Build ARM64 on macOS + arch: arm64 steps: - uses: actions/checkout@v4 From 7e4a4672d8b826625ff60cf6a4a4f4c324a70d7e Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Feb 2025 09:20:23 +0100 Subject: [PATCH 4/6] Update pyproject.toml --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 310ac11..173ee6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,8 @@ archs = ["auto"] skip = "pp* *musllinux* cp37-* cp38-* cp313-*" # Build CPython 3.9 - 3.12 before-test = "pip install -r requirements_test.txt" test-command = "pytest {project}/tests" +manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64" +manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64" [tool.cibuildwheel.macos] archs = ["native"] From cb7d8e4b558c22e1e362b95dd3995a8eb889a433 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 12 Feb 2025 23:30:58 +0100 Subject: [PATCH 5/6] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2016968..f9e7345 100644 --- a/setup.py +++ b/setup.py @@ -62,5 +62,5 @@ ), python_requires=">=3.9", keywords="TetGen", - install_requires=["numpy>=2,<3", "pyvista>=0.31.0"], + install_requires=["numpy>=1.26.4,<3", "pyvista>=0.31.0"], ) From ada30da46adc4c14f70d1507a8c96346f09a8207 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 12 Feb 2025 23:31:18 +0100 Subject: [PATCH 6/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 173ee6a..9ecdfb2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "setuptools>=42", "wheel>=0.33.0", "cython>=3.0.0", - "numpy>=2,<3", + "numpy>=1.26.4,<3", ] build-backend = "setuptools.build_meta"