From 0f94b219c8ee4f311b375a528690cb8763416df0 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:58:00 +0100 Subject: [PATCH 1/8] refactor: removing duplicity --- src/ansys/mapdl/core/plotting/visualizer.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ansys/mapdl/core/plotting/visualizer.py b/src/ansys/mapdl/core/plotting/visualizer.py index 6f36a527bd..0b0eef90bf 100644 --- a/src/ansys/mapdl/core/plotting/visualizer.py +++ b/src/ansys/mapdl/core/plotting/visualizer.py @@ -225,11 +225,6 @@ def get_meshes_from_plotter(self): list[pv.PolyData] Plotted meshes. """ - datasets = [] - for actor in self.scene.actors.values(): - if hasattr(actor, "mapper"): - datasets.append(actor.mapper.dataset) - return [ actor.mapper.dataset for actor in self.scene.actors.values() From 772072c4984aa6ed6316c4fdc682eaeb0a9f50a6 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:03:36 +0100 Subject: [PATCH 2/8] build: update vtk --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c14c4f6868..e8226407bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,7 +69,7 @@ tests = [ "pytest-rerunfailures==15.0", "pytest==8.3.4", "scipy==1.14.1", - "vtk==9.3.1", + "vtk==9.4.0", ] doc = [ "ansys-dpf-core==0.10.1", @@ -101,7 +101,7 @@ doc = [ "sphinx==8.1.3", "sphinxcontrib-websupport==2.0.0", "sphinxemoji==0.3.1", - "vtk==9.3.1", + "vtk==9.4.0", ] [tool.flit.module] From 7d0b389d33ddc209d5c5ed09094503cfd12dae9b Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot <92810346+pyansys-ci-bot@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:51:58 +0000 Subject: [PATCH 3/8] chore: adding changelog file 3615.dependencies.md [dependabot-skip] --- doc/changelog.d/3615.dependencies.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/3615.dependencies.md diff --git a/doc/changelog.d/3615.dependencies.md b/doc/changelog.d/3615.dependencies.md new file mode 100644 index 0000000000..9f83a709d3 --- /dev/null +++ b/doc/changelog.d/3615.dependencies.md @@ -0,0 +1 @@ +build: update to vtk 9.4.0 \ No newline at end of file From a7c59a719e48141cd9e93d5ac17ee6cb22863f96 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:01:46 +0100 Subject: [PATCH 4/8] build: update ansys-tools-visualization-interface to 0.6.1 --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index efd58c4c50..24502cd547 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ jupyter = [ tests = [ "ansys-dpf-core==0.10.1", - "ansys-tools-visualization-interface==0.6.0", + "ansys-tools-visualization-interface==0.6.1", "autopep8==2.3.1", "matplotlib==3.9.3", "pandas==2.2.3", @@ -75,7 +75,7 @@ doc = [ "ansys-dpf-core==0.10.1", "ansys-mapdl-reader==0.54.2", "ansys-sphinx-theme==1.2.3", - "ansys-tools-visualization-interface==0.6.0", + "ansys-tools-visualization-interface==0.6.1", "grpcio==1.68.1", "imageio-ffmpeg==0.5.1", "imageio==2.36.1", From d66fb35844c9243937a899499246b9b0cae2357a Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:12:13 +0100 Subject: [PATCH 5/8] build: update ansys-tools-visualization-interface==0.6.2. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 24502cd547..c962cec9f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ jupyter = [ tests = [ "ansys-dpf-core==0.10.1", - "ansys-tools-visualization-interface==0.6.1", + "ansys-tools-visualization-interface==0.6.2", "autopep8==2.3.1", "matplotlib==3.9.3", "pandas==2.2.3", @@ -75,7 +75,7 @@ doc = [ "ansys-dpf-core==0.10.1", "ansys-mapdl-reader==0.54.2", "ansys-sphinx-theme==1.2.3", - "ansys-tools-visualization-interface==0.6.1", + "ansys-tools-visualization-interface==0.6.2", "grpcio==1.68.1", "imageio-ffmpeg==0.5.1", "imageio==2.36.1", From be2b0f99f800fbe75c87217306c94985a73c14b4 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:20:40 +0100 Subject: [PATCH 6/8] fix: checking dataset attribute too --- src/ansys/mapdl/core/plotting/visualizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansys/mapdl/core/plotting/visualizer.py b/src/ansys/mapdl/core/plotting/visualizer.py index 0b0eef90bf..3b8f72d9cb 100644 --- a/src/ansys/mapdl/core/plotting/visualizer.py +++ b/src/ansys/mapdl/core/plotting/visualizer.py @@ -228,7 +228,7 @@ def get_meshes_from_plotter(self): return [ actor.mapper.dataset for actor in self.scene.actors.values() - if hasattr(actor, "mapper") + if hasattr(actor, "mapper") and hasattr(actor.mapper, "dataset") ] def add_labels( From 4f03b7d80a62c2d1fadeec90a352c1b0648cef8d Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:52:22 +0100 Subject: [PATCH 7/8] ci: adding more printouts --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 888deef9e0..97aec65ddf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ env: DPF_PORT: 21004 MAPDL_PACKAGE: ghcr.io/ansys/mapdl ON_CI: True - PYTEST_ARGUMENTS: '-vvv -rxXsa --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html' + PYTEST_ARGUMENTS: '-vvv -rxXsal --full-trace --tb=long --color=yes --durations=10 --random-order --random-order-bucket=class --maxfail=10 --reruns 3 --reruns-delay 4 --cov=ansys.mapdl.core --cov-report=html' BUILD_CHEATSHEET: True From e5748370cb48cc9d22b6366642c312ab37da47c8 Mon Sep 17 00:00:00 2001 From: German <28149841+germa89@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:53:54 +0100 Subject: [PATCH 8/8] fix: backup method for meshes --- src/ansys/mapdl/core/plotting/visualizer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ansys/mapdl/core/plotting/visualizer.py b/src/ansys/mapdl/core/plotting/visualizer.py index 3b8f72d9cb..05e9843490 100644 --- a/src/ansys/mapdl/core/plotting/visualizer.py +++ b/src/ansys/mapdl/core/plotting/visualizer.py @@ -851,4 +851,12 @@ def scene(self): @property def meshes(self): """Return the meshes.""" - return self.scene.meshes + try: + # Pyvista 0.44.2 makes this method to fail, so adding a backup plan + return self.scene.meshes + except AttributeError: + return [ + actor.mapper.dataset + for actor in self.scene.actors.values() + if hasattr(actor, "mapper") and hasattr(actor.mapper, "dataset") + ]