From 43af6ea618512bb8fb1800ca536cb8908605b467 Mon Sep 17 00:00:00 2001 From: PProfizi Date: Wed, 17 Sep 2025 12:28:19 +0200 Subject: [PATCH 1/4] Revert "ci: temporarily switch to ubuntu-22.04 (#910)" This reverts commit 4ac80c1a7d8c8b37eddc69398b288bf43a3d3e2b. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/ci_release.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 620e7a410..33d29cbea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11"] - os: ["windows-latest", "ubuntu-22.04"] + os: ["windows-latest", "ubuntu-latest"] steps: - uses: actions/checkout@v4 @@ -154,7 +154,7 @@ jobs: fail-fast: false matrix: python-version: ["3.10"] - os: ["windows-latest", "ubuntu-22.04"] + os: ["windows-latest", "ubuntu-latest"] ANSYS_VERSION: - ${{ fromJson(vars.ANSYS_VERSIONS_RETRO) }} - ${{ fromJson(vars.ANSYS_VERSION_LAST_RELEASED) }} @@ -182,7 +182,7 @@ jobs: standalone_suffix: ${{ matrix.ANSYS_VERSION == '241' && '.sp01' || '' }} - name: "Prepare Testing Environment" - uses: ansys/pydpf-actions/prepare_tests@dependencies/bump_pyvista_setup-headless-display-action_to_v4 + uses: ansys/pydpf-actions/prepare_tests@v2.3 with: DEBUG: true @@ -278,4 +278,4 @@ jobs: run: | git checkout master git reset --hard main - git push + git push \ No newline at end of file diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 679a7233f..a35002ac8 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -66,7 +66,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11"] - os: ["windows-latest", "ubuntu-22.04"] + os: ["windows-latest", "ubuntu-latest"] steps: - uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - name: "Prepare Testing Environment" - uses: ansys/pydpf-actions/prepare_tests@dependencies/bump_pyvista_setup-headless-display-action_to_v4 + uses: ansys/pydpf-actions/prepare_tests@v2.3 with: DEBUG: true @@ -134,7 +134,7 @@ jobs: fail-fast: false matrix: python-version: ["3.10"] - os: ["windows-latest", "ubuntu-22.04"] + os: ["windows-latest", "ubuntu-latest"] ANSYS_VERSION: ${{ fromJson(vars.ANSYS_VERSIONS_RETRO) }} steps: From 92c61b530fcef76a57d506f4c1eab503e1ee250d Mon Sep 17 00:00:00 2001 From: PProfizi Date: Wed, 17 Sep 2025 12:29:08 +0200 Subject: [PATCH 2/4] Bump vtk to 9.5.1 --- requirements/requirements_docs.txt | 2 +- requirements/requirements_test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index d1ea407bc..bd26254f8 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -12,5 +12,5 @@ sphinx-gallery==0.19.0 ansys_sphinx_theme==1.4.1 sphinx-autodoc-typehints==3.0.1 pyvista==0.46.0 -vtk==9.4.2 +vtk==9.5.1 sphinx-design===0.6.1 diff --git a/requirements/requirements_test.txt b/requirements/requirements_test.txt index b95d40852..62a03aece 100644 --- a/requirements/requirements_test.txt +++ b/requirements/requirements_test.txt @@ -3,4 +3,4 @@ pytest-cov==6.2.1 pytest-rerunfailures==15.1 pytest==8.4.1 pyvista==0.46.0 -vtk==9.4.2 +vtk==9.5.1 From f124fb448dd06326fdd08b8be7a8d72a7fd87860 Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Wed, 17 Sep 2025 16:34:35 +0200 Subject: [PATCH 3/4] Bump pyvista to 0.46.3 --- requirements/requirements_docs.txt | 2 +- requirements/requirements_test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt index bd26254f8..e6b7f43b7 100644 --- a/requirements/requirements_docs.txt +++ b/requirements/requirements_docs.txt @@ -11,6 +11,6 @@ sphinx-copybutton==0.5.0 sphinx-gallery==0.19.0 ansys_sphinx_theme==1.4.1 sphinx-autodoc-typehints==3.0.1 -pyvista==0.46.0 +pyvista==0.46.3 vtk==9.5.1 sphinx-design===0.6.1 diff --git a/requirements/requirements_test.txt b/requirements/requirements_test.txt index 62a03aece..79220d7e6 100644 --- a/requirements/requirements_test.txt +++ b/requirements/requirements_test.txt @@ -2,5 +2,5 @@ coverage==7.10.2 pytest-cov==6.2.1 pytest-rerunfailures==15.1 pytest==8.4.1 -pyvista==0.46.0 +pyvista==0.46.3 vtk==9.5.1 From 3814698c756166781e95ca2dbee118cd621200ae Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Tue, 23 Sep 2025 09:46:13 +0200 Subject: [PATCH 4/4] Skip broken flprj test in test_dataframe.py --- tests/test_dataframe.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_dataframe.py b/tests/test_dataframe.py index 70c748f4d..b62e0689b 100644 --- a/tests/test_dataframe.py +++ b/tests/test_dataframe.py @@ -24,6 +24,7 @@ import numpy as np import pytest from pytest import fixture +from sys import platform from ansys.dpf import post from ansys.dpf.post import examples @@ -38,7 +39,7 @@ from ansys.dpf.post.modal_mechanical_simulation import ModalMechanicalSimulation from ansys.dpf.post.static_mechanical_simulation import StaticMechanicalSimulation from ansys.dpf.post.transient_mechanical_simulation import TransientMechanicalSimulation -from conftest import SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0 +from conftest import SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0, SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0 @fixture @@ -147,6 +148,10 @@ def test_dataframe_select_no_set_index(): assert len(df2.mesh_index.values) == len(df.mesh_index.values) +@pytest.mark.skipif( + not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0 and platform == "linux", + reason="Flprj broken in Linux for 251, 242 and 241.", +) @pytest.mark.skipif( not SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_7_0, reason="Fluid capabilities added with ansys-dpf-server 2024.1.pre0.",