diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 55f045a79d8..7a8a2d16bdd 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: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.11", "3.12"]' + python_versions: '["3.11", "3.12", "3.13"]' DOCSTRING: false wheel: false wheelhouse: true @@ -109,7 +109,7 @@ jobs: uses: ./.github/workflows/tests.yml with: ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.11", "3.12"]' + python_versions: '["3.11", "3.12", "3.13"]' DOCSTRING: false wheel: false wheelhouse: false @@ -129,7 +129,7 @@ jobs: uses: ./.github/workflows/examples.yml with: ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.10", "3.11", "3.12"]' + python_versions: '["3.10", "3.11", "3.12", "3.13"]' standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit @@ -236,7 +236,7 @@ jobs: uses: ./.github/workflows/examples_docker.yml with: ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.10", "3.11", "3.12"]' + python_versions: '["3.10", "3.11", "3.12", "3.13"]' standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 26eb29f4317..755009416ef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -207,7 +207,7 @@ jobs: uses: ansys/pydpf-actions/prepare_tests@dependencies/bump_pyvista_setup-headless-display-action_to_v4 with: DEBUG: true - + - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) uses: ansys/pydpf-actions/test_docstrings@v2.3 @@ -221,17 +221,9 @@ jobs: shell: bash 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 || vars.ANSYS_VERSION_DEFAULT }}" -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 || vars.ANSYS_VERSION_DEFAULT }}"' >> "$GITHUB_OUTPUT" - fi + echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}"' >> "$GITHUB_OUTPUT" 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.3.20240907.dev0"' >> "$GITHUB_OUTPUT" - else - echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }}' >> "$GITHUB_OUTPUT" - fi + echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }}' >> "$GITHUB_OUTPUT" fi - name: "Organize test files" diff --git a/tox.ini b/tox.ini index e5eef844f8d..8f134dc2f00 100644 --- a/tox.ini +++ b/tox.ini @@ -225,10 +225,6 @@ commands = # Remove previously rendered documentation clean: python -c "import shutil, sys; shutil.rmtree(sys.argv[1], ignore_errors=True)" "{toxinidir}/{env:BUILD_DIR}" - # 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.3.20240907.dev0 - # Clean files from previous build html: python -c "\ html: from os.path import exists; import shutil; \