From 429e76c58dac0e15b3b25b6e2076168cb0d29624 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Sun, 11 May 2025 22:03:08 +0200 Subject: [PATCH 01/10] ci: add py313 to release pipeline --- .github/workflows/ci_release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 13fad27c9fb..83811d34e9b 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.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: ${{ github.event.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: ${{ github.event.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: ${{ github.event.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 From 33909af2fd4aa376330214e3fd2cdc843f9dc571 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 12 May 2025 09:46:55 +0200 Subject: [PATCH 02/10] ci: test against non-osmesa vtk wheels --- .github/workflows/tests.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fd5f8914df7..8b3bb21f0a0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -223,17 +223,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}}" -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 + echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}"' >> "$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" From e085323c8c2f11df0f758bdbc66833eb3b12cf72 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 09:56:06 +0200 Subject: [PATCH 03/10] fix: install libosmesa for linux runners --- .github/workflows/tests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8b3bb21f0a0..611fd859c6f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -210,6 +210,13 @@ jobs: with: DEBUG: true + - name: "Setup LibOSMesa on Linux runners" + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt-get update + sudo apt-get install libosmesa6 + - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) uses: ansys/pydpf-actions/test_docstrings@v2.3 From 5351c2f7c2d8c5c488b7ba2f510bf4644a267db9 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 10:18:27 +0200 Subject: [PATCH 04/10] fix: install libosmesa for linux runners --- .github/workflows/examples.yml | 7 +++++++ .github/workflows/examples_docker.yml | 7 +++++++ .github/workflows/pydpf-post.yml | 7 +++++++ .github/workflows/test_docker.yml | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 2b77137a8ed..8eccd48a680 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -124,6 +124,13 @@ jobs: with: DEBUG: true + - name: "Setup LibOSMesa on Linux runners" + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt-get update + sudo apt-get install libosmesa6 + - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index e6e379b59c2..cd0ff948c47 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -120,6 +120,13 @@ jobs: with: DEBUG: true + - name: "Setup LibOSMesa on Linux runners" + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt-get update + sudo apt-get install libosmesa6 + - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index c0db176f0d1..1a6bfbb81e1 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -142,6 +142,13 @@ jobs: DEBUG: true working-directory: pydpf-post + - name: "Setup LibOSMesa on Linux runners" + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt-get update + sudo apt-get install libosmesa6 + - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 3ee2ee91d46..73feeaf9fde 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -102,6 +102,13 @@ jobs: with: DEBUG: true + - name: "Setup LibOSMesa on Linux runners" + if: runner.os == 'Linux' + shell: bash + run: | + sudo apt-get update + sudo apt-get install libosmesa6 + - name: "List installed packages" shell: bash run: pip list From 77b950333c62e0822cb8f1c9de1d6ebc333ca791 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 10:32:17 +0200 Subject: [PATCH 05/10] fix: install libosmesa for linux runners --- .github/workflows/examples.yml | 1 + .github/workflows/examples_docker.yml | 1 + .github/workflows/pydpf-post.yml | 1 + .github/workflows/test_docker.yml | 1 + .github/workflows/tests.yml | 2 ++ 5 files changed, 6 insertions(+) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 8eccd48a680..96c1b31cf90 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -130,6 +130,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libosmesa6 + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index cd0ff948c47..107a8aa4c97 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -126,6 +126,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libosmesa6 + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index 1a6bfbb81e1..458f8f8afe8 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -148,6 +148,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libosmesa6 + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 73feeaf9fde..18e85b4845d 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -108,6 +108,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libosmesa6 + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 611fd859c6f..3510956b9f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -209,6 +209,7 @@ jobs: uses: ansys/pydpf-actions/prepare_tests@dependencies/bump_pyvista_setup-headless-display-action_to_v4 with: DEBUG: true + - name: "Setup LibOSMesa on Linux runners" if: runner.os == 'Linux' @@ -216,6 +217,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libosmesa6 + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) From bee7275db40ca5d83fa9e9e1814a38205a7486c4 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 10:58:40 +0200 Subject: [PATCH 06/10] fix: install libosmesa for linux runners --- .github/workflows/examples.yml | 8 +++++--- .github/workflows/examples_docker.yml | 7 ++++--- .github/workflows/pydpf-post.yml | 7 ++++--- .github/workflows/test_docker.yml | 8 +++++--- .github/workflows/tests.yml | 8 ++++---- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 96c1b31cf90..26399647365 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -128,9 +128,11 @@ jobs: if: runner.os == 'Linux' shell: bash run: | - sudo apt-get update - sudo apt-get install libosmesa6 - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + # sudo apt-get update + # sudo apt-get install libosmesa6 + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + - name: "List installed packages" shell: bash diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index 107a8aa4c97..9d1b3cc5993 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -124,9 +124,10 @@ jobs: if: runner.os == 'Linux' shell: bash run: | - sudo apt-get update - sudo apt-get install libosmesa6 - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + # sudo apt-get update + # sudo apt-get install libosmesa6 + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index 458f8f8afe8..0f656ee8b1e 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -146,9 +146,10 @@ jobs: if: runner.os == 'Linux' shell: bash run: | - sudo apt-get update - sudo apt-get install libosmesa6 - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + # sudo apt-get update + # sudo apt-get install libosmesa6 + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 18e85b4845d..598d43c296e 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -106,9 +106,11 @@ jobs: if: runner.os == 'Linux' shell: bash run: | - sudo apt-get update - sudo apt-get install libosmesa6 - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + # sudo apt-get update + # sudo apt-get install libosmesa6 + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + - name: "List installed packages" shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3510956b9f2..849769ceb55 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -210,14 +210,14 @@ jobs: with: DEBUG: true - - name: "Setup LibOSMesa on Linux runners" if: runner.os == 'Linux' shell: bash run: | - sudo apt-get update - sudo apt-get install libosmesa6 - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + # sudo apt-get update + # sudo apt-get install libosmesa6 + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} + echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) From 48f9e373b0d8caa7890e8d9638c56d7e420db7bc Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 13:57:57 +0200 Subject: [PATCH 07/10] fix: install libosmesa for linux runners --- .github/workflows/examples.yml | 2 +- .github/workflows/examples_docker.yml | 2 +- .github/workflows/pydpf-post.yml | 2 +- .github/workflows/test_docker.yml | 2 +- .github/workflows/tests.yml | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 26399647365..a5e7c693383 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -131,7 +131,7 @@ jobs: # sudo apt-get update # sudo apt-get install libosmesa6 # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index 9d1b3cc5993..4dff680d00b 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -127,7 +127,7 @@ jobs: # sudo apt-get update # sudo apt-get install libosmesa6 # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index 0f656ee8b1e..86b1364d922 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -149,7 +149,7 @@ jobs: # sudo apt-get update # sudo apt-get install libosmesa6 # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" shell: bash diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index 598d43c296e..a7c251b82a4 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -109,7 +109,7 @@ jobs: # sudo apt-get update # sudo apt-get install libosmesa6 # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "List installed packages" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 849769ceb55..a348301d770 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -217,7 +217,7 @@ jobs: # sudo apt-get update # sudo apt-get install libosmesa6 # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} + # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) @@ -240,7 +240,7 @@ jobs: - name: "Organize test files" shell: bash run: | - tox -e pretest + xvfb-run tox -e pretest - name: "Test API test_entry" uses: nick-fields/retry@v3 @@ -249,7 +249,7 @@ jobs: max_attempts: 2 shell: bash command: | - tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Run compatible tests in parallel" uses: nick-fields/retry@v3 @@ -258,7 +258,7 @@ jobs: max_attempts: 2 shell: bash command: | - tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_server" uses: nick-fields/retry@v3 @@ -267,7 +267,7 @@ jobs: max_attempts: 2 shell: bash command: | - tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_remote_workflow" uses: nick-fields/retry@v3 @@ -276,12 +276,12 @@ jobs: max_attempts: 3 shell: bash command: | - tox -e test-remote_workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-remote_workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_remote_operator" shell: bash run: | - tox -e test-remote_operator,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-remote_operator,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_workflow" uses: nick-fields/retry@v3 @@ -290,7 +290,7 @@ jobs: max_attempts: 4 shell: bash command: | - tox -e test-workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_service" uses: nick-fields/retry@v3 @@ -299,7 +299,7 @@ jobs: max_attempts: 2 shell: bash command: | - tox -e test-service,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + xvfb-run tox -e test-service,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Combine coverage results" shell: bash From ee9e445b747208550dbd2730c98b993427adf610 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 14:25:06 +0200 Subject: [PATCH 08/10] fix: install libosmesa for linux runners --- .github/workflows/examples.yml | 10 ---------- .github/workflows/examples_docker.yml | 9 --------- .github/workflows/pydpf-post.yml | 9 --------- .github/workflows/test_docker.yml | 10 ---------- .github/workflows/tests.yml | 25 ++++++++----------------- 5 files changed, 8 insertions(+), 55 deletions(-) diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index a5e7c693383..2b77137a8ed 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -124,16 +124,6 @@ jobs: with: DEBUG: true - - name: "Setup LibOSMesa on Linux runners" - if: runner.os == 'Linux' - shell: bash - run: | - # sudo apt-get update - # sudo apt-get install libosmesa6 - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - - - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml index 4dff680d00b..e6e379b59c2 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -120,15 +120,6 @@ jobs: with: DEBUG: true - - name: "Setup LibOSMesa on Linux runners" - if: runner.os == 'Linux' - shell: bash - run: | - # sudo apt-get update - # sudo apt-get install libosmesa6 - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml index 86b1364d922..c0db176f0d1 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -142,15 +142,6 @@ jobs: DEBUG: true working-directory: pydpf-post - - name: "Setup LibOSMesa on Linux runners" - if: runner.os == 'Linux' - shell: bash - run: | - # sudo apt-get update - # sudo apt-get install libosmesa6 - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml index a7c251b82a4..3ee2ee91d46 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -102,16 +102,6 @@ jobs: with: DEBUG: true - - name: "Setup LibOSMesa on Linux runners" - if: runner.os == 'Linux' - shell: bash - run: | - # sudo apt-get update - # sudo apt-get install libosmesa6 - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - - - name: "List installed packages" shell: bash run: pip list diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a348301d770..333f590115f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -210,15 +210,6 @@ jobs: with: DEBUG: true - - name: "Setup LibOSMesa on Linux runners" - if: runner.os == 'Linux' - shell: bash - run: | - # sudo apt-get update - # sudo apt-get install libosmesa6 - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkOSOpenGLRenderWindow" >> ${GITHUB_ENV} - # echo "VTK_DEFAULT_OPENGL_WINDOW=vtkEGLRenderWindow" >> ${GITHUB_ENV} - - name: "Test Docstrings" if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) uses: ansys/pydpf-actions/test_docstrings@v2.3 @@ -240,7 +231,7 @@ jobs: - name: "Organize test files" shell: bash run: | - xvfb-run tox -e pretest + tox -e pretest - name: "Test API test_entry" uses: nick-fields/retry@v3 @@ -249,7 +240,7 @@ jobs: max_attempts: 2 shell: bash command: | - xvfb-run tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-api_entry,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Run compatible tests in parallel" uses: nick-fields/retry@v3 @@ -258,7 +249,7 @@ jobs: max_attempts: 2 shell: bash command: | - xvfb-run tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox run-parallel -m ciparalleltests ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_server" uses: nick-fields/retry@v3 @@ -267,7 +258,7 @@ jobs: max_attempts: 2 shell: bash command: | - xvfb-run tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-server,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_remote_workflow" uses: nick-fields/retry@v3 @@ -276,12 +267,12 @@ jobs: max_attempts: 3 shell: bash command: | - xvfb-run tox -e test-remote_workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-remote_workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_remote_operator" shell: bash run: | - xvfb-run tox -e test-remote_operator,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-remote_operator,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_workflow" uses: nick-fields/retry@v3 @@ -290,7 +281,7 @@ jobs: max_attempts: 4 shell: bash command: | - xvfb-run tox -e test-workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-workflow,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Test API test_service" uses: nick-fields/retry@v3 @@ -299,7 +290,7 @@ jobs: max_attempts: 2 shell: bash command: | - xvfb-run tox -e test-service,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} + tox -e test-service,kill-servers ${{ steps.tox-cli-arguments.outputs.TOX_EXTRA_ARG }} - name: "Combine coverage results" shell: bash From 60b2f3b469f13f36830dd909b58318198305dc45 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Mon, 19 May 2025 14:29:22 +0200 Subject: [PATCH 09/10] ci: trigger workflow From fd8ed7190da2ade3c9979ef557e0fe995ded3894 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Tue, 20 May 2025 08:56:49 +0200 Subject: [PATCH 10/10] ci: drop osmesa vtk wheels in tox --- tox.ini | 4 ---- 1 file changed, 4 deletions(-) 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; \