From 037574a51d5ea370ae7ba54d49ced5076a54c9af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 04:37:52 +0000 Subject: [PATCH 01/10] Bump sphinx from 8.1.3 to 8.2.3 in /requirements Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 8.1.3 to 8.2.3. - [Release notes](https://github.com/sphinx-doc/sphinx/releases) - [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES.rst) - [Commits](https://github.com/sphinx-doc/sphinx/compare/v8.1.3...v8.2.3) --- updated-dependencies: - dependency-name: sphinx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/requirements_docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 43af348629e..e99b8992097 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -7,7 +7,7 @@ nbsphinx==0.9.6 pypandoc==1.15 pytest-sphinx==0.6.3 pyvista==0.44.2 -sphinx==8.1.3 +sphinx==8.2.3 sphinx-copybutton==0.5.2 sphinx-gallery==0.19.0 sphinx-jinja==2.0.2 From 868c65db1627a92ed5b79900a9d30061f9d51095 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 14 Mar 2025 10:27:36 +0100 Subject: [PATCH 02/10] fix: bump python version --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e2b87ddd9c..af91201aac4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,6 +151,7 @@ jobs: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} event_name: ${{ github.event_name }} + python_version: "3.11" secrets: inherit upload-development-docs: From 14b6fd833b8a56bf22f5d18f8e87feba278fff87 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 14 Mar 2025 10:47:36 +0100 Subject: [PATCH 03/10] fix: nbsphinx dependency dropped --- requirements/requirements_docs.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index 35787a323da..23499d08175 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -3,7 +3,6 @@ enum-tools[sphinx]==0.12.0 graphviz==0.20.1 imageio==2.37.0 imageio-ffmpeg==0.6.0 -nbsphinx==0.9.6 pypandoc==1.15 pytest-sphinx==0.6.3 pyvista==0.44.2 From 35849998bbb2054b16a50866fa852ab935a2b283 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 14 Mar 2025 12:52:44 +0100 Subject: [PATCH 04/10] ci: drop 3.9 in pipelines and add 3.12 --- .github/workflows/ci.yml | 22 +++++++++++----------- .github/workflows/ci_release.yml | 18 +++++++++--------- .github/workflows/examples.yml | 4 ++-- .github/workflows/examples_docker.yml | 4 ++-- .github/workflows/pydpf-post.yml | 2 +- .github/workflows/test_docker.yml | 2 +- .github/workflows/tests.yml | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af91201aac4..efdc8b0da16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ concurrency: env: DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com' - MAIN_PYTHON_VERSION: '3.9' + MAIN_PYTHON_VERSION: '3.10' jobs: debug: @@ -106,7 +106,7 @@ jobs: needs: pick_server_suffix with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' wheel: true wheelhouse: false standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} @@ -117,7 +117,7 @@ jobs: needs: pick_server_suffix with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' wheel: true wheelhouse: false standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} @@ -139,7 +139,7 @@ jobs: needs: pick_server_suffix with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit @@ -175,7 +175,7 @@ jobs: needs: pick_server_suffix with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit @@ -185,7 +185,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "251" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false standalone_suffix: '' secrets: inherit @@ -196,7 +196,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "242" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false standalone_suffix: '' secrets: inherit @@ -207,7 +207,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "241" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false standalone_suffix: '.sp01' secrets: inherit @@ -218,7 +218,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "232" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false standalone_suffix: '' secrets: inherit @@ -229,7 +229,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "231" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit @@ -239,7 +239,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "222" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 450cfb64c66..d27820c2ffd 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -77,7 +77,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' wheel: true wheelhouse: true standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} @@ -98,7 +98,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.9"]' + python_versions: '["3.10"]' wheel: true wheelhouse: false standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} @@ -129,7 +129,7 @@ jobs: uses: ./.github/workflows/examples.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.9", "3.10", "3.11"]' + python_versions: '["3.10", "3.11", "3.12"]' standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit @@ -138,7 +138,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "242" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit @@ -147,7 +147,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "241" - python_versions: '["3.9"]' + python_versions: '["3.10"]' standalone_suffix: '.sp01' DOCSTRING: false secrets: inherit @@ -157,7 +157,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "232" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit @@ -166,7 +166,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "231" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit @@ -175,7 +175,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: "222" - python_versions: '["3.9"]' + python_versions: '["3.10"]' DOCSTRING: false secrets: inherit @@ -236,7 +236,7 @@ jobs: uses: ./.github/workflows/examples_docker.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.9", "3.10", "3.11"]' + python_versions: '["3.10", "3.11", "3.12"]' standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 9ef7ee947a3..43745875746 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -7,7 +7,7 @@ on: python_versions: required: false type: string - default: '["3.9"]' + default: '["3.10"]' ANSYS_VERSION: required: false type: string @@ -24,7 +24,7 @@ on: description: "Python interpreters to test." required: true type: string - default: '["3.9"]' + default: '["3.10"]' ANSYS_VERSION: description: "ANSYS version to run." required: true diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index 3c8ea4f51d8..59161839453 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -7,7 +7,7 @@ on: python_versions: required: false type: string - default: '["3.9"]' + default: '["3.10"]' ANSYS_VERSION: required: false type: string @@ -24,7 +24,7 @@ on: description: "Python interpreters to test." required: true type: string - default: '["3.9"]' + default: '["3.10"]' ANSYS_VERSION: description: "ANSYS version to run." required: true diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index 3e21beeb98f..956b800cdd9 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -56,7 +56,7 @@ jobs: fail-fast: false matrix: os: ["windows-latest", "ubuntu-latest"] - python-version: ["3.9"] + python-version: ["3.10"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 9b8c8daff2d..8ec66ef4987 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9"] + python-version: ["3.10"] os: ["ubuntu-latest"] steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8d38677ec5..bdb511140d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ on: python_versions: required: false type: string - default: '["3.9"]' + default: '["3.10"]' ANSYS_VERSION: required: false type: string @@ -41,7 +41,7 @@ on: description: "Python interpreters to test." required: true type: string - default: '["3.9", "3.10", "3.11"]' + default: '["3.10", "3.11", "3.12"]' ANSYS_VERSION: description: "ANSYS version" required: true From 79fb9d493f2392a40ccd9ef4099ce57d94523cad Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 14 Mar 2025 14:57:36 +0100 Subject: [PATCH 05/10] ci: drop nbsphinx --- requirements/requirements_docs.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index be25fe9f7c0..a4750003033 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -3,7 +3,6 @@ enum-tools[sphinx]==0.12.0 graphviz==0.20.1 imageio==2.37.0 imageio-ffmpeg==0.6.0 -nbsphinx==0.9.7 pypandoc==1.15 pytest-sphinx==0.6.3 pyvista==0.44.2 From 5abad6933fd0b2df5cd053c7588a7042d9a4e752 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 14 Mar 2025 15:04:46 +0100 Subject: [PATCH 06/10] ci: use more recent osmesa releases --- .github/workflows/tests.yml | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bdb511140d9..6ec2f0c5bc6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -224,13 +224,13 @@ jobs: run: | if [ $MODE == 'PIP' ]; then if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then - echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}" -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0"' >> "$GITHUB_OUTPUT" + echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}" -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.20240907.dev0"' >> "$GITHUB_OUTPUT" else echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}"' >> "$GITHUB_OUTPUT" fi else if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then - echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0"' >> "$GITHUB_OUTPUT" + echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.20240907.dev0"' >> "$GITHUB_OUTPUT" else echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }}' >> "$GITHUB_OUTPUT" fi diff --git a/tox.ini b/tox.ini index 82ddbc65856..e6384ef1a44 100644 --- a/tox.ini +++ b/tox.ini @@ -227,7 +227,7 @@ commands = # Ensure vtk compatibility html: python -m pip uninstall --yes vtk - html: python -m pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0 + html: python -m pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.20240907.dev0 # Clean files from previous build html: python -c "\ From 42d22679fa5edba28355048168cede803492e00f Mon Sep 17 00:00:00 2001 From: moe-ad Date: Tue, 18 Mar 2025 09:27:06 +0100 Subject: [PATCH 07/10] ci: change doc python version --- .github/workflows/docs.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fe41436285c..d61606c844d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ on: python_version: required: false type: string - default: "3.10" + default: "3.11" ANSYS_VERSION: required: false type: string @@ -29,7 +29,7 @@ on: description: "Python interpreter" required: true type: string - default: "3.10" + default: "3.11" ANSYS_VERSION: description: "ANSYS version" required: true @@ -44,7 +44,6 @@ on: env: PACKAGE_NAME: ansys-dpf-core MODULE: core - VTK_OSMESA_VERSION: "9.2.20230527.dev0" jobs: doc-style: name: "Check doc style" From 12b5963c09b8facfe37714e5ee2f26c7af16513f Mon Sep 17 00:00:00 2001 From: moe-ad Date: Tue, 18 Mar 2025 09:32:22 +0100 Subject: [PATCH 08/10] ci: small edits --- .github/workflows/ci_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index d27820c2ffd..442ceb9f9af 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -73,7 +73,7 @@ jobs: name: ${{ steps.wheel.outputs.wheel_name }} path: dist/${{ steps.wheel.outputs.wheel_name }} - tests_3_9: + tests_3_10: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} @@ -94,7 +94,7 @@ jobs: standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit - tests_any_3_9: + tests_any_3_10: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} From b8713661264e13d66b515895c62d30257e42ef90 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Tue, 18 Mar 2025 09:34:40 +0100 Subject: [PATCH 09/10] ci: small edits --- .github/workflows/ci_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 442ceb9f9af..f0fb645a11a 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -243,7 +243,7 @@ jobs: draft_release: name: "Draft Release" if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - needs: [style, tests, tests_3_9, tests_any, tests_any_3_9, docs, examples, retro_232, retro_231, retro_222, docker_tests] + needs: [style, tests, tests_3_10, tests_any, tests_any_3_10, docs, examples, retro_232, retro_231, retro_222, docker_tests] runs-on: ubuntu-latest steps: - name: "Download artifacts" From 6bc323105f25b7813534538fa176c8f5b6b17fe7 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Tue, 18 Mar 2025 09:39:21 +0100 Subject: [PATCH 10/10] ci: final edits --- .github/workflows/ci_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index f0fb645a11a..13fad27c9fb 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -87,7 +87,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.10", "3.11"]' + python_versions: '["3.11", "3.12"]' DOCSTRING: false wheel: false wheelhouse: true @@ -109,7 +109,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - python_versions: '["3.10", "3.11"]' + python_versions: '["3.11", "3.12"]' DOCSTRING: false wheel: false wheelhouse: false