diff --git a/.github/workflows/pysplashsurf_CI.yml b/.github/workflows/pysplashsurf_CI.yml index 32d730c..c6a6d7f 100644 --- a/.github/workflows/pysplashsurf_CI.yml +++ b/.github/workflows/pysplashsurf_CI.yml @@ -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/ @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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/ @@ -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 @@ -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 @@ -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 @@ -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/ @@ -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/ @@ -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: >- @@ -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/ diff --git a/Cargo.lock b/Cargo.lock index a0b6151..1b7798d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1363,9 +1363,9 @@ dependencies = [ [[package]] name = "pyo3-stub-gen" -version = "0.19.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b159f7704044f57d058f528a6f1f22a0a0a327dcb595c5fb38beae658e0338d6" +checksum = "1242a6080f45edcfaf3be3b9968914dd47a408c5590aea22770b978f7c36ffa7" dependencies = [ "anyhow", "chrono", @@ -1389,9 +1389,9 @@ dependencies = [ [[package]] name = "pyo3-stub-gen-derive" -version = "0.19.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c79e7c5b1fcec7c39ab186594658a971c59911eb6fbab5a5932cf2318534be" +checksum = "fd9a73abe6f57890e657c265b86805637138f83203e1a56bc156078abf215e36" dependencies = [ "heck", "indexmap", diff --git a/pysplashsurf/Cargo.toml b/pysplashsurf/Cargo.toml index 36dd2a9..9fc3bed 100644 --- a/pysplashsurf/Cargo.toml +++ b/pysplashsurf/Cargo.toml @@ -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"] } diff --git a/pysplashsurf/pysplashsurf/docs/requirements.txt b/pysplashsurf/pysplashsurf/docs/requirements.txt index 7269857..fb88bf2 100644 --- a/pysplashsurf/pysplashsurf/docs/requirements.txt +++ b/pysplashsurf/pysplashsurf/docs/requirements.txt @@ -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 diff --git a/pysplashsurf/python_environment.yaml b/pysplashsurf/python_environment.yaml index c1abb25..f2f8c1d 100644 --- a/pysplashsurf/python_environment.yaml +++ b/pysplashsurf/python_environment.yaml @@ -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 \ No newline at end of file