Skip to content

Commit a7caee7

Browse files
authored
Merge pull request #463 from tataratat/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2 parents 97ad46f + 65b2984 commit a7caee7

9 files changed

Lines changed: 39 additions & 41 deletions

File tree

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
Language: Cpp
32
# BasedOnStyle: LLVM
43
AccessModifierOffset: -2
54
AlignAfterOpenBracket: Align

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
doxygen Doxyfile
2525
2626
- name: Set up python
27-
uses: actions/setup-python@v3
27+
uses: actions/setup-python@v5
2828
with:
2929
python-version: "3.10"
3030

3131
- name: build splinepy linux
32-
run: CC=clang-14 CXX=clang++-14 pip install ".[test]" -v --config-settings=cmake.args=-DSPLINEPY_MORE=OFF
32+
run: CC=clang CXX=clang++ pip install ".[test]" -v --config-settings=cmake.args=-DSPLINEPY_MORE=OFF
3333

3434
- name: test
3535
run: |
@@ -44,7 +44,7 @@ jobs:
4444
sphinx-build -W -b html docs/source docs/build
4545
4646
- name: deploy docs only if it is pushed to main
47-
uses: peaceiris/actions-gh-pages@v3
47+
uses: peaceiris/actions-gh-pages@v4
4848
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
4949
with:
5050
#publish_branch: gh-pages

.github/workflows/main.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
with:
1818
submodules: recursive
1919
- name: build wheels
20-
uses: pypa/cibuildwheel@v2.16.5
20+
uses: pypa/cibuildwheel@v2.23.2
2121
env:
2222
CIBW_ARCHS: ${{ matrix.arch }}
2323
CIBW_BUILD: ${{ matrix.cw_build }}
2424
SPLINEPY_GITHUB_ACTIONS_BUILD: True
2525
SKBUILD_INSTALL_COMPONENTS: PythonModule
2626

27-
- uses: actions/upload-artifact@v3
27+
- uses: actions/upload-artifact@v4
2828
with:
2929
path: ./wheelhouse/*.whl
3030
retention-days: 2
@@ -41,14 +41,14 @@ jobs:
4141
with:
4242
submodules: recursive
4343
- name: build wheels
44-
uses: pypa/cibuildwheel@v2.16.5
44+
uses: pypa/cibuildwheel@v2.23.2
4545
env:
4646
CIBW_ARCHS: ${{ matrix.arch }}
4747
CIBW_BUILD: ${{ matrix.cw_build }}
4848
SPLINEPY_GITHUB_ACTIONS_BUILD: True
4949
SKBUILD_INSTALL_COMPONENTS: PythonModule
5050

51-
- uses: actions/upload-artifact@v3
51+
- uses: actions/upload-artifact@v4
5252
with:
5353
path: ./wheelhouse/*.whl
5454
retention-days: 2
@@ -65,14 +65,14 @@ jobs:
6565
with:
6666
submodules: recursive
6767
- name: build wheels
68-
uses: pypa/cibuildwheel@v2.16.5
68+
uses: pypa/cibuildwheel@v2.23.2
6969
env:
7070
CIBW_ARCHS: ${{ matrix.arch }}
7171
CIBW_BUILD: ${{ matrix.cw_build }}
7272
SPLINEPY_GITHUB_ACTIONS_BUILD: True
7373
SKBUILD_INSTALL_COMPONENTS: PythonModule
7474

75-
- uses: actions/upload-artifact@v3
75+
- uses: actions/upload-artifact@v4
7676
with:
7777
path: ./wheelhouse/*.whl
7878
retention-days: 2
@@ -89,15 +89,15 @@ jobs:
8989
with:
9090
submodules: recursive
9191
- name: build wheels
92-
uses: pypa/cibuildwheel@v2.16.5
92+
uses: pypa/cibuildwheel@v2.23.2
9393
env:
9494
CIBW_ARCHS: ${{ matrix.arch }}
9595
CIBW_BUILD: ${{ matrix.cw_build }}
9696
CIBW_TEST_SKIP: "*-win_arm64"
9797
SPLINEPY_GITHUB_ACTIONS_BUILD: True
9898
SKBUILD_INSTALL_COMPONENTS: PythonModule
9999

100-
- uses: actions/upload-artifact@v3
100+
- uses: actions/upload-artifact@v4
101101
with:
102102
path: ./wheelhouse/*.whl
103103
retention-days: 2
@@ -112,7 +112,7 @@ jobs:
112112
- name: Build sdist
113113
run: pipx run build --sdist
114114

115-
- uses: actions/upload-artifact@v3
115+
- uses: actions/upload-artifact@v4
116116
with:
117117
path: ./dist/*
118118
retention-days: 2
@@ -124,7 +124,7 @@ jobs:
124124
permissions:
125125
id-token: write
126126
steps:
127-
- uses: actions/download-artifact@v3
127+
- uses: actions/download-artifact@v4
128128
with:
129129
name: artifact
130130
path: dist

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
submodules: recursive
2222
- name: Set up ${{ matrix.python-version }}
23-
uses: actions/setup-python@v4
23+
uses: actions/setup-python@v5
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626

.github/workflows/test_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
strategy:
1616
matrix:
1717
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
18-
os: [ubuntu-20.04, macos-latest, windows-latest]
18+
os: [ubuntu-latest, macos-latest, windows-latest]
1919

2020
steps:
2121
- uses: actions/checkout@v4
2222
with:
2323
submodules: recursive
2424
- name: Set up ${{ matrix.python-version }}
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828

.github/workflows/test_wheels.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
with:
1919
submodules: recursive
2020
- name: build wheels
21-
uses: pypa/cibuildwheel@v2.16.5
21+
uses: pypa/cibuildwheel@v2.23.2
2222
env:
2323
CIBW_ARCHS: ${{ matrix.arch }}
2424
CIBW_BUILD: ${{ matrix.cw_build }}
2525
SPLINEPY_GITHUB_ACTIONS_BUILD: True
2626

27-
- uses: actions/upload-artifact@v3
27+
- uses: actions/upload-artifact@v4
2828
with:
2929
path: ./wheelhouse/*.whl
3030
retention-days: 1
@@ -43,13 +43,13 @@ jobs:
4343
with:
4444
submodules: recursive
4545
- name: build wheels
46-
uses: pypa/cibuildwheel@v2.16.5
46+
uses: pypa/cibuildwheel@v2.23.2
4747
env:
4848
CIBW_ARCHS: ${{ matrix.arch }}
4949
CIBW_BUILD: ${{ matrix.cw_build }}
5050
SPLINEPY_GITHUB_ACTIONS_BUILD: True
5151

52-
- uses: actions/upload-artifact@v3
52+
- uses: actions/upload-artifact@v4
5353
with:
5454
path: ./wheelhouse/*.whl
5555
retention-days: 1
@@ -68,13 +68,13 @@ jobs:
6868
with:
6969
submodules: recursive
7070
- name: build wheels
71-
uses: pypa/cibuildwheel@v2.16.5
71+
uses: pypa/cibuildwheel@v2.23.2
7272
env:
7373
CIBW_ARCHS: ${{ matrix.arch }}
7474
CIBW_BUILD: ${{ matrix.cw_build }}
7575
SPLINEPY_GITHUB_ACTIONS_BUILD: True
7676

77-
- uses: actions/upload-artifact@v3
77+
- uses: actions/upload-artifact@v4
7878
with:
7979
path: ./wheelhouse/*.whl
8080
retention-days: 1
@@ -92,14 +92,14 @@ jobs:
9292
with:
9393
submodules: recursive
9494
- name: build wheels
95-
uses: pypa/cibuildwheel@v2.16.5
95+
uses: pypa/cibuildwheel@v2.23.2
9696
env:
9797
CIBW_ARCHS: ${{ matrix.arch }}
9898
CIBW_BUILD: ${{ matrix.cw_build }}
9999
CIBW_TEST_SKIP: "*-win_arm64"
100100
SPLINEPY_GITHUB_ACTIONS_BUILD: True
101101

102-
- uses: actions/upload-artifact@v3
102+
- uses: actions/upload-artifact@v4
103103
with:
104104
path: ./wheelhouse/*.whl
105105
retention-days: 1
@@ -114,7 +114,7 @@ jobs:
114114
- name: Build sdist
115115
run: pipx run build --sdist
116116

117-
- uses: actions/upload-artifact@v3
117+
- uses: actions/upload-artifact@v4
118118
with:
119119
path: ./dist/*
120120
retention-days: 1

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ repos:
2929
- id: trailing-whitespace
3030

3131
- repo: https://github.com/psf/black
32-
rev: "24.10.0"
32+
rev: "25.1.0"
3333
hooks:
3434
- id: black
3535
additional_dependencies: [tomli]
3636

3737
- repo: https://github.com/astral-sh/ruff-pre-commit
38-
rev: v0.8.3
38+
rev: v0.11.2
3939
hooks:
4040
- id: ruff
4141
args: [--fix, --exit-non-zero-on-fix]
4242

4343
- repo: https://github.com/pre-commit/mirrors-clang-format
44-
rev: v19.1.5
44+
rev: v20.1.0
4545
hooks:
4646
- id: clang-format
4747
types_or: [c, c++]
@@ -52,7 +52,7 @@ repos:
5252
- id: cmake-format
5353

5454
- repo: https://github.com/codespell-project/codespell
55-
rev: v2.3.0
55+
rev: v2.4.1
5656
hooks:
5757
- id: codespell
5858
args: [-w]

examples/run_all_examples.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
"""Call all *.py files in the working directory.
2-
"""
1+
"""Call all *.py files in the working directory."""
32

43
import glob
54
import itertools

tests/test_orientation.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""Test Orientation between adjacent spline patches
2-
2--3
3-
|C |
4-
0--1
5-
0--1 2--3 1--3
6-
|D | |A | | B|
7-
2--3 0--1 0--2
8-
1--0
9-
| |E |
10-
O- 3--2
2+
2--3
3+
|C |
4+
0--1
5+
0--1 2--3 1--3
6+
|D | |A | | B|
7+
2--3 0--1 0--2
8+
1--0
9+
| |E |
10+
O- 3--2
1111
"""
1212

1313
import numpy as np

0 commit comments

Comments
 (0)