Skip to content

Commit 56d3e6a

Browse files
w1th0utnam3w1th0utnam3
authored
Update actions and bump Python dependencies (#240)
* Bump stub-gen * Bump Python environment * Update actions
1 parent a0c6a10 commit 56d3e6a

5 files changed

Lines changed: 50 additions & 48 deletions

File tree

‎.github/workflows/pysplashsurf_CI.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
name: Run stub generator
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v6
3030
- uses: moonrepo/setup-rust@v1
3131
- run: |
3232
cargo run --bin stub_gen --no-default-features
3333
working-directory: pysplashsurf
3434
- name: Upload stub as artifact
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: pysplashsurf.pyi
3838
path: pysplashsurf/pysplashsurf/
@@ -60,7 +60,7 @@ jobs:
6060
# steps:
6161
# - uses: actions/checkout@v6
6262
# - name: Download stub artifact
63-
# uses: actions/download-artifact@v4
63+
# uses: actions/download-artifact@v8
6464
# with:
6565
# name: pysplashsurf.pyi
6666
# path: pysplashsurf/pysplashsurf/
@@ -96,7 +96,7 @@ jobs:
9696
# CIBW_BEFORE_ALL_LINUX: curl -sSf https://sh.rustup.rs | sh -s -- -y
9797
# CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
9898
# - name: Upload wheels
99-
# uses: actions/upload-artifact@v4
99+
# uses: actions/upload-artifact@v7
100100
# with:
101101
# name: wheels-${{ matrix.python-version }}
102102
# path: wheelhouse
@@ -112,7 +112,7 @@ jobs:
112112
steps:
113113
- uses: actions/checkout@v6
114114
- name: Download stub artifact
115-
uses: actions/download-artifact@v4
115+
uses: actions/download-artifact@v8
116116
with:
117117
name: pysplashsurf.pyi
118118
path: pysplashsurf/pysplashsurf/
@@ -131,7 +131,7 @@ jobs:
131131
pip install auditwheel
132132
auditwheel repair wheelhouse/*.whl
133133
- name: Upload wheels
134-
uses: actions/upload-artifact@v4
134+
uses: actions/upload-artifact@v7
135135
with:
136136
name: wheels-linux-${{ matrix.target }}
137137
path: wheelhouse
@@ -155,7 +155,7 @@ jobs:
155155
# steps:
156156
# - uses: actions/checkout@v6
157157
# - name: Download stub artifact
158-
# uses: actions/download-artifact@v4
158+
# uses: actions/download-artifact@v8
159159
# with:
160160
# name: pysplashsurf.pyi
161161
# path: pysplashsurf/pysplashsurf/
@@ -174,7 +174,7 @@ jobs:
174174
# CIBW_TEST_SOURCES: "pysplashsurf/tests"
175175
# CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
176176
# - name: Upload wheels
177-
# uses: actions/upload-artifact@v4
177+
# uses: actions/upload-artifact@v7
178178
# with:
179179
# name: wheels-${{ matrix.python-version }}
180180
# path: wheelhouse
@@ -192,7 +192,7 @@ jobs:
192192
steps:
193193
- uses: actions/checkout@v6
194194
- name: Download stub artifact
195-
uses: actions/download-artifact@v4
195+
uses: actions/download-artifact@v8
196196
with:
197197
name: pysplashsurf.pyi
198198
path: pysplashsurf/pysplashsurf/
@@ -210,7 +210,7 @@ jobs:
210210
pip install delocate
211211
delocate-wheel -v wheelhouse/*.whl
212212
- name: Upload wheels
213-
uses: actions/upload-artifact@v4
213+
uses: actions/upload-artifact@v7
214214
with:
215215
name: wheels-macos-${{ matrix.target }}
216216
path: wheelhouse
@@ -230,7 +230,7 @@ jobs:
230230
# steps:
231231
# - uses: actions/checkout@v6
232232
# - name: Download stub artifact
233-
# uses: actions/download-artifact@v4
233+
# uses: actions/download-artifact@v8
234234
# with:
235235
# name: pysplashsurf.pyi
236236
# path: pysplashsurf/pysplashsurf/
@@ -249,7 +249,7 @@ jobs:
249249
# #CIBW_TEST_SOURCES: "pysplashsurf/tests"
250250
# #CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
251251
# - name: Upload wheels
252-
# uses: actions/upload-artifact@v4
252+
# uses: actions/upload-artifact@v7
253253
# with:
254254
# name: wheels-${{ matrix.python-version }}
255255
# path: wheelhouse
@@ -274,7 +274,7 @@ jobs:
274274
steps:
275275
- uses: actions/checkout@v6
276276
- name: Download stub artifact
277-
uses: actions/download-artifact@v4
277+
uses: actions/download-artifact@v8
278278
with:
279279
name: pysplashsurf.pyi
280280
path: pysplashsurf/pysplashsurf/
@@ -293,7 +293,7 @@ jobs:
293293
pip install delvewheel
294294
delvewheel show -v wheelhouse/*.whl
295295
- name: Upload wheels
296-
uses: actions/upload-artifact@v4
296+
uses: actions/upload-artifact@v7
297297
with:
298298
name: wheels-windows-${{ matrix.target }}
299299
path: wheelhouse
@@ -305,7 +305,7 @@ jobs:
305305
steps:
306306
- uses: actions/checkout@v6
307307
- name: Download stub artifact
308-
uses: actions/download-artifact@v4
308+
uses: actions/download-artifact@v8
309309
with:
310310
name: pysplashsurf.pyi
311311
path: pysplashsurf/pysplashsurf/
@@ -315,7 +315,7 @@ jobs:
315315
command: sdist
316316
args: --out dist -m pysplashsurf/Cargo.toml
317317
- name: Upload sdist
318-
uses: actions/upload-artifact@v4
318+
uses: actions/upload-artifact@v7
319319
with:
320320
name: wheels-sdist
321321
path: dist
@@ -326,7 +326,7 @@ jobs:
326326
if: ${{ startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
327327
needs: [linux_wheels, macos_wheels, windows_wheels, sdist, tests, docs]
328328
steps:
329-
- uses: actions/download-artifact@v4
329+
- uses: actions/download-artifact@v8
330330
with:
331331
pattern: wheels-*
332332
merge-multiple: true
@@ -367,7 +367,7 @@ jobs:
367367
FILE_NAME=$(ls dist)
368368
echo "file_name=$FILE_NAME" >> $GITHUB_OUTPUT
369369
- name: Upload wheel
370-
uses: actions/upload-artifact@v4
370+
uses: actions/upload-artifact@v7
371371
with:
372372
name: doc_tests_wheel
373373
path: dist
@@ -382,7 +382,7 @@ jobs:
382382
with:
383383
python-version: 3.12
384384
- name: Download wheel
385-
uses: actions/download-artifact@v4
385+
uses: actions/download-artifact@v8
386386
with:
387387
name: doc_tests_wheel
388388
path: dist/
@@ -392,7 +392,7 @@ jobs:
392392
- uses: ammaraskar/sphinx-action@8.2.3
393393
with:
394394
docs-folder: "pysplashsurf/pysplashsurf/docs/"
395-
- uses: actions/upload-artifact@v4
395+
- uses: actions/upload-artifact@v7
396396
with:
397397
name: DocumentationHTML
398398
path: pysplashsurf/pysplashsurf/docs/build/html/
@@ -418,7 +418,7 @@ jobs:
418418
- uses: actions/setup-python@v6
419419
with:
420420
python-version: 3.12
421-
- uses: mamba-org/setup-micromamba@v2
421+
- uses: mamba-org/setup-micromamba@v3
422422
with:
423423
environment-file: pysplashsurf/python_environment.yaml
424424
init-shell: >-
@@ -427,7 +427,7 @@ jobs:
427427
conda info
428428
conda list
429429
- name: Download wheel
430-
uses: actions/download-artifact@v4
430+
uses: actions/download-artifact@v8
431431
with:
432432
name: doc_tests_wheel
433433
path: dist/

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pysplashsurf/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ numpy = "0.28"
1313
ndarray = "0.17"
1414
bytemuck = { version = "1.23", features = ["extern_crate_alloc"] }
1515
anyhow = "1.0"
16-
pyo3-stub-gen = "0.19"
16+
pyo3-stub-gen = "0.22"
1717

1818
[build-dependencies]
1919
pyo3-build-config = { version = "0.28" , features = ["resolve-config"] }

‎pysplashsurf/pysplashsurf/docs/requirements.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
pip==26.0
2-
sphinx==8.2.3
3-
numpy==2.2.3
1+
pip==26.1
2+
sphinx==9.1.0
3+
sphinx_rtd_theme==3.1.0
4+
sphinx-autodoc-typehints==3.10.4
5+
numpy==2.4.6
46
meshio==5.3.5
5-
sphinx_rtd_theme==3.0.1
6-
numpydoc==1.8.0
7-
myst-parser==4.0.1
8-
sphinx-autodoc-typehints==3.2.0
7+
numpydoc==1.10.0
8+
myst-parser==5.1.0

‎pysplashsurf/python_environment.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ name: pysplashsurf
55
channels:
66
- conda-forge
77
dependencies:
8-
- maturin=1.8.2
9-
- patchelf=0.17.2
8+
- maturin=1.13.3
9+
- patchelf
1010
- meshio=5.3.5
11-
- numpy=2.2.3
12-
- pip=25.0.1
11+
- numpy=2.4.6
12+
- pip=26.1
1313
- python=3.13.2
1414
- python_abi=3.13
15-
- numpydoc=1.8.0
16-
- trimesh=4.6.5
17-
- rtree=1.4.0
18-
- scipy=1.15.2
19-
- pytest=8.3.5
15+
- numpydoc=1.10.0
16+
- trimesh=4.12.2
17+
- rtree=1.4.1
18+
- scipy=1.17.1
19+
- pytest=9.0.3
2020
- pytest-md=0.2.0
2121

22-
- sphinx=8.2.3
23-
- sphinx_rtd_theme=3.0.1
24-
- myst-parser=4.0.1
25-
- numpydoc==1.8.0
26-
- sphinx-autodoc-typehints==3.2.0
22+
- sphinx=9.1.0
23+
# - sphinx_rtd_theme=3.1.0
24+
- sphinx-autodoc-typehints==3.10.4
25+
- myst-parser=5.1.0
26+
- numpydoc==1.10.0
27+
- pip:
28+
- sphinx_rtd_theme==3.1.0 # The 3.1.0 release of sphinx_rtd_theme on conda-forge is broken, see: https://github.com/conda-forge/sphinx_rtd_theme-feedstock/issues/40

0 commit comments

Comments
 (0)