Skip to content

Commit cf2d64d

Browse files
committed
Merge branch 'main' into release/0.3
2 parents 11c45a0 + 93b5ee3 commit cf2d64d

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/build-and-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
15+
os: [ubuntu-latest, ubuntu-22.04-arm, windows-latest, macos-13, macos-14]
1616

1717
steps:
1818
- uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
6767
mkdir -p dist
6868
find artifacts -name '*.whl' -exec mv {} dist/ \;
6969
70-
- uses: pypa/gh-action-pypi-publish@v1.12.4
70+
- uses: pypa/gh-action-pypi-publish@v1.13.0
7171
with:
7272
user: __token__
7373
password: ${{ secrets.PYPI_TOKEN }}

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ci:
33
autoupdate_schedule: quarterly
44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
6-
rev: v0.11.11
6+
rev: v0.13.3
77
hooks:
88
- id: ruff
99
args: [--fix, --exit-non-zero-on-fix]
@@ -25,26 +25,26 @@ repos:
2525
# exclude: "tests/"
2626

2727
- repo: https://github.com/pre-commit/mirrors-mypy
28-
rev: v1.15.0
28+
rev: v1.18.2
2929
hooks:
3030
- id: mypy
3131
additional_dependencies: [numpy>=2.0, pytest-stub, npt-promote]
3232

3333
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
34-
rev: v2.14.0
34+
rev: v2.15.0
3535
hooks:
3636
- id: pretty-format-toml
3737
args: [--autofix]
3838
- id: pretty-format-yaml
3939
args: [--autofix, --indent, '2']
4040

4141
- repo: https://github.com/pre-commit/mirrors-clang-format
42-
rev: v20.1.5
42+
rev: v21.1.2
4343
hooks:
4444
- id: clang-format
4545

4646
- repo: https://github.com/pre-commit/pre-commit-hooks
47-
rev: v5.0.0
47+
rev: v6.0.0
4848
hooks:
4949
- id: check-merge-conflict
5050
- id: debug-statements
@@ -55,7 +55,7 @@ repos:
5555

5656
# this validates our github workflow files
5757
- repo: https://github.com/python-jsonschema/check-jsonschema
58-
rev: 0.33.0
58+
rev: 0.34.0
5959
hooks:
6060
- id: check-github-workflows
6161

pyproject.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ classifiers = [
2020
dependencies = [
2121
"numpy",
2222
"pyvista>=0.37.0",
23-
'pykdtree'
23+
"pykdtree",
24+
# VTK < 9.5 doesn't have prebuilt ARM64 wheels
25+
"vtk~=9.5 ; sys_platform == 'linux' and platform_machine == 'aarch64'"
2426
]
2527
description = "Uniformly remeshes surface meshes"
2628
keywords = ["vtk", "uniform", "meshing", "remeshing", "acvd"]
@@ -40,6 +42,10 @@ test-command = "pytest {project}/tests"
4042
test-requires = "pytest"
4143
test-skip = "*-macosx_arm64"
4244

45+
[tool.cibuildwheel.linux]
46+
# Use manylinux_2_28 for aarch64 to support VTK 9.5 wheels
47+
manylinux-aarch64-image = "manylinux_2_28"
48+
4349
[tool.cibuildwheel.macos]
4450
archs = ["native"]
4551

0 commit comments

Comments
 (0)