Skip to content

Commit 05323cc

Browse files
committed
merge main
2 parents 6f47859 + 055375f commit 05323cc

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

.github/workflows/testing-and-deployment.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ jobs:
2424
- name: Set up Python
2525
uses: actions/setup-python@v5
2626
with:
27-
python-version: '3.10'
27+
python-version: '3.12'
2828

29-
- name: Install OS packages
30-
run: |
31-
sudo apt update
32-
sudo apt install libgl1-mesa-glx
29+
- name: Setup headless display
30+
uses: pyvista/setup-headless-display-action@v3
3331

3432
- name: Build and validate wheel
3533
run: |
@@ -62,20 +60,18 @@ jobs:
6260
- name: Setup Python
6361
uses: actions/setup-python@v5
6462
with:
65-
python-version: '3.10'
63+
python-version: '3.12'
6664

67-
- name: Install OS packages
68-
run: |
69-
sudo apt update
70-
sudo apt install libgl1-mesa-glx xvfb
65+
- name: Setup headless display
66+
uses: pyvista/setup-headless-display-action@v3
7167

7268
- name: Install library
7369
run: pip install .
7470

7571
- name: Build Documentation
7672
run: |
7773
pip install -r requirements_docs.txt
78-
xvfb-run make -C doc html
74+
make -C doc html
7975
8076
- name: Deploy on tag
8177
uses: JamesIves/github-pages-deploy-action@v4
@@ -98,7 +94,7 @@ jobs:
9894
- uses: actions/checkout@v4
9995

10096
- name: Build wheels
101-
uses: pypa/cibuildwheel@v2.20.0
97+
uses: pypa/cibuildwheel@v2.23.2
10298

10399
- name: List generated wheels
104100
run: ls ./wheelhouse/*

.pre-commit-config.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1+
# Integration with GitHub Actions
2+
# See https://pre-commit.ci/
3+
ci:
4+
autoupdate_schedule: monthly
5+
16
repos:
27
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.6.3
8+
rev: v0.11.4
49
hooks:
510
- id: ruff
611
args: [--fix, --exit-non-zero-on-fix]
712
exclude: ^(docs/|tests)
813
- id: ruff-format
914

1015
- repo: https://github.com/pycqa/isort
11-
rev: 5.13.2
16+
rev: 6.0.1
1217
hooks:
1318
- id: isort
1419

1520
- repo: https://github.com/codespell-project/codespell
16-
rev: v2.3.0
21+
rev: v2.4.1
1722
hooks:
1823
- id: codespell
1924
args: [--toml, pyproject.toml]
@@ -33,7 +38,7 @@ repos:
3338
# exclude: "tests/"
3439

3540
- repo: https://github.com/pre-commit/pre-commit-hooks
36-
rev: v4.6.0
41+
rev: v5.0.0
3742
hooks:
3843
- id: check-merge-conflict
3944
- id: debug-statements
@@ -52,6 +57,6 @@ repos:
5257

5358
# this validates our github workflow files
5459
- repo: https://github.com/python-jsonschema/check-jsonschema
55-
rev: 0.29.2
60+
rev: 0.32.1
5661
hooks:
5762
- id: check-github-workflows

fast_simplification/simplify.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
def _check_args(target_reduction, target_count, n_faces):
1010
"""Check arguments."""
1111
if target_reduction and target_count:
12-
raise ValueError(
13-
"You may specify ``target_reduction`` or ``target_count``, but not" " both"
14-
)
12+
raise ValueError("You may specify ``target_reduction`` or ``target_count``, but not both")
1513
if target_reduction is None and target_count is None:
1614
raise ValueError("You must specify ``target_reduction`` or ``target_count``")
1715

@@ -196,9 +194,7 @@ def simplify_mesh(mesh, target_reduction=None, target_count=None, agg=7, verbose
196194
try:
197195
import pyvista as pv
198196
except ImportError:
199-
raise ImportError(
200-
"Please install pyvista to use this feature with:\n" "pip install pyvista"
201-
)
197+
raise ImportError("Please install pyvista to use this feature with:\npip install pyvista")
202198

203199
n_faces = mesh.n_cells
204200
_simplify.load_from_vtk(

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ requires = [
99

1010
[tool.cibuildwheel]
1111
archs = ["auto64"] # 64-bit only
12-
skip = "cp313-* pp* *musllinux*" # Build CPython 3.9 - 3.13
12+
skip = "cp314-* pp* *musllinux*" # Build CPython 3.9 - 3.13
1313
test-command = "pytest {project}/tests"
1414
test-requires = "pyvista pytest"
1515

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def build_extensions(self):
7777
"Programming Language :: Python :: 3.10",
7878
"Programming Language :: Python :: 3.11",
7979
"Programming Language :: Python :: 3.12",
80+
"Programming Language :: Python :: 3.13",
8081
],
8182
url="https://github.com/pyvista/fast-simplification",
8283
python_requires=">=3.9",

0 commit comments

Comments
 (0)