Skip to content

Update actions and bump Python dependencies #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
w1th0utnam3 merged 3 commits into from
Jun 2, 2026
Merged

Update actions and bump Python dependencies #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9ef134
Bump stub-gen
w1th0utnam3 Jun 2, 2026
1841630
Bump Python environment
w1th0utnam3 Jun 2, 2026
88d6aba
Update actions
w1th0utnam3 Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .github/workflows/pysplashsurf_CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
name: Run stub generator
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
- uses: moonrepo/setup-rust@v1
- run: |
cargo run --bin stub_gen --no-default-features
working-directory: pysplashsurf
- name: Upload stub as artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: pysplashsurf.pyi
path: pysplashsurf/pysplashsurf/
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
# steps:
# - uses: actions/checkout@v6
# - name: Download stub artifact
# uses: actions/download-artifact@v4
# uses: actions/download-artifact@v8
# with:
# name: pysplashsurf.pyi
# path: pysplashsurf/pysplashsurf/
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
# CIBW_BEFORE_ALL_LINUX: curl -sSf https://sh.rustup.rs | sh -s -- -y
# CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
# - name: Upload wheels
# uses: actions/upload-artifact@v4
# uses: actions/upload-artifact@v7
# with:
# name: wheels-${{ matrix.python-version }}
# path: wheelhouse
Expand All @@ -112,7 +112,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Download stub artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: pysplashsurf.pyi
path: pysplashsurf/pysplashsurf/
Expand All @@ -131,7 +131,7 @@ jobs:
pip install auditwheel
auditwheel repair wheelhouse/*.whl
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wheels-linux-${{ matrix.target }}
path: wheelhouse
Expand All @@ -155,7 +155,7 @@ jobs:
# steps:
# - uses: actions/checkout@v6
# - name: Download stub artifact
# uses: actions/download-artifact@v4
# uses: actions/download-artifact@v8
# with:
# name: pysplashsurf.pyi
# path: pysplashsurf/pysplashsurf/
Expand All @@ -174,7 +174,7 @@ jobs:
# CIBW_TEST_SOURCES: "pysplashsurf/tests"
# CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
# - name: Upload wheels
# uses: actions/upload-artifact@v4
# uses: actions/upload-artifact@v7
# with:
# name: wheels-${{ matrix.python-version }}
# path: wheelhouse
Expand All @@ -192,7 +192,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Download stub artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: pysplashsurf.pyi
path: pysplashsurf/pysplashsurf/
Expand All @@ -210,7 +210,7 @@ jobs:
pip install delocate
delocate-wheel -v wheelhouse/*.whl
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wheels-macos-${{ matrix.target }}
path: wheelhouse
Expand All @@ -230,7 +230,7 @@ jobs:
# steps:
# - uses: actions/checkout@v6
# - name: Download stub artifact
# uses: actions/download-artifact@v4
# uses: actions/download-artifact@v8
# with:
# name: pysplashsurf.pyi
# path: pysplashsurf/pysplashsurf/
Expand All @@ -249,7 +249,7 @@ jobs:
# #CIBW_TEST_SOURCES: "pysplashsurf/tests"
# #CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
# - name: Upload wheels
# uses: actions/upload-artifact@v4
# uses: actions/upload-artifact@v7
# with:
# name: wheels-${{ matrix.python-version }}
# path: wheelhouse
Expand All @@ -274,7 +274,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Download stub artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: pysplashsurf.pyi
path: pysplashsurf/pysplashsurf/
Expand All @@ -293,7 +293,7 @@ jobs:
pip install delvewheel
delvewheel show -v wheelhouse/*.whl
- name: Upload wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wheels-windows-${{ matrix.target }}
path: wheelhouse
Expand All @@ -305,7 +305,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Download stub artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: pysplashsurf.pyi
path: pysplashsurf/pysplashsurf/
Expand All @@ -315,7 +315,7 @@ jobs:
command: sdist
args: --out dist -m pysplashsurf/Cargo.toml
- name: Upload sdist
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: wheels-sdist
path: dist
Expand All @@ -326,7 +326,7 @@ jobs:
if: ${{ startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
needs: [linux_wheels, macos_wheels, windows_wheels, sdist, tests, docs]
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: wheels-*
merge-multiple: true
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
FILE_NAME=$(ls dist)
echo "file_name=$FILE_NAME" >> $GITHUB_OUTPUT
- name: Upload wheel
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: doc_tests_wheel
path: dist
Expand All @@ -382,7 +382,7 @@ jobs:
with:
python-version: 3.12
- name: Download wheel
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: doc_tests_wheel
path: dist/
Expand All @@ -392,7 +392,7 @@ jobs:
- uses: ammaraskar/sphinx-action@8.2.3
with:
docs-folder: "pysplashsurf/pysplashsurf/docs/"
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: DocumentationHTML
path: pysplashsurf/pysplashsurf/docs/build/html/
Expand All @@ -418,7 +418,7 @@ jobs:
- uses: actions/setup-python@v6
with:
python-version: 3.12
- uses: mamba-org/setup-micromamba@v2
- uses: mamba-org/setup-micromamba@v3
with:
environment-file: pysplashsurf/python_environment.yaml
init-shell: >-
Expand All @@ -427,7 +427,7 @@ jobs:
conda info
conda list
- name: Download wheel
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: doc_tests_wheel
path: dist/
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pysplashsurf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ numpy = "0.28"
ndarray = "0.17"
bytemuck = { version = "1.23", features = ["extern_crate_alloc"] }
anyhow = "1.0"
pyo3-stub-gen = "0.19"
pyo3-stub-gen = "0.22"

[build-dependencies]
pyo3-build-config = { version = "0.28" , features = ["resolve-config"] }
Expand Down
14 changes: 7 additions & 7 deletions pysplashsurf/pysplashsurf/docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pip==26.0
sphinx==8.2.3
numpy==2.2.3
pip==26.1
sphinx==9.1.0
sphinx_rtd_theme==3.1.0
sphinx-autodoc-typehints==3.10.4
numpy==2.4.6
meshio==5.3.5
sphinx_rtd_theme==3.0.1
numpydoc==1.8.0
myst-parser==4.0.1
sphinx-autodoc-typehints==3.2.0
numpydoc==1.10.0
myst-parser==5.1.0
30 changes: 16 additions & 14 deletions pysplashsurf/python_environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@ name: pysplashsurf
channels:
- conda-forge
dependencies:
- maturin=1.8.2
- patchelf=0.17.2
- maturin=1.13.3
- patchelf
- meshio=5.3.5
- numpy=2.2.3
- pip=25.0.1
- numpy=2.4.6
- pip=26.1
- python=3.13.2
- python_abi=3.13
- numpydoc=1.8.0
- trimesh=4.6.5
- rtree=1.4.0
- scipy=1.15.2
- pytest=8.3.5
- numpydoc=1.10.0
- trimesh=4.12.2
- rtree=1.4.1
- scipy=1.17.1
- pytest=9.0.3
- pytest-md=0.2.0

- sphinx=8.2.3
- sphinx_rtd_theme=3.0.1
- myst-parser=4.0.1
- numpydoc==1.8.0
- sphinx-autodoc-typehints==3.2.0
- sphinx=9.1.0
# - sphinx_rtd_theme=3.1.0
- sphinx-autodoc-typehints==3.10.4
- myst-parser=5.1.0
- numpydoc==1.10.0
- pip:
- 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
Loading