From 3b87effdccbd1f9de08964849ba30a13c3baf7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Morais?=
 <146729917+SMoraisAnsys@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:30:26 +0200
Subject: [PATCH] BUILD: Update version of pyvista (#4906)

---
 .github/workflows/ci_cd.yml         |  8 ++++----
 _unittest/test_04_SBR.py            |  2 --
 _unittest/test_12_PostProcessing.py |  1 -
 pyproject.toml                      | 12 ++++--------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index a8170ef3608..7062747303e 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -176,7 +176,7 @@ jobs:
           .venv\Scripts\Activate.ps1
           # Uninstall conflicting dependencies
           pip uninstall --yes vtk
-          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0
+          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
 
       # TODO: Update this step once pyaedt-examples is ready
       # NOTE: Use environment variable to keep the doctree and avoid redundant build for PDF pages
@@ -259,7 +259,7 @@ jobs:
           .venv\Scripts\Activate.ps1
           # Uninstall conflicting dependencies
           pip uninstall --yes vtk
-          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0
+          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
 
       - name: Run tests on _unittest_solvers
         env:
@@ -375,7 +375,7 @@ jobs:
           .venv\Scripts\Activate.ps1
           # Uninstall conflicting dependencies
           pip uninstall --yes vtk
-          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0
+          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
 
       - name: Run tests on _unittest
         uses: nick-fields/retry@v3
@@ -445,7 +445,7 @@ jobs:
           source .venv/bin/activate
           # Uninstall conflicting dependencies
           pip uninstall --yes vtk
-          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0
+          pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
 
       - name: Run tests on _unittest
         uses: nick-fields/retry@v3
diff --git a/_unittest/test_04_SBR.py b/_unittest/test_04_SBR.py
index 7ef95e00347..9da95012550 100644
--- a/_unittest/test_04_SBR.py
+++ b/_unittest/test_04_SBR.py
@@ -24,7 +24,6 @@
 
 import builtins
 import os
-import sys
 from unittest.mock import mock_open
 
 from mock import patch
@@ -254,7 +253,6 @@ def test_12_import_map(self):
         for part in parts_dict["parts"]:
             assert os.path.exists(parts_dict["parts"][part]["file_name"])
 
-    @pytest.mark.skipif(sys.version_info > (3, 8), reason="Bug in VTK with 3.12")
     @pytest.mark.skipif(is_linux, reason="feature supported in Cpython")
     def test_16_read_hdm(self):
         self.aedtapp.insert_design("hdm")
diff --git a/_unittest/test_12_PostProcessing.py b/_unittest/test_12_PostProcessing.py
index 0dfebc86637..18cf6a6de65 100644
--- a/_unittest/test_12_PostProcessing.py
+++ b/_unittest/test_12_PostProcessing.py
@@ -650,7 +650,6 @@ def test_70_far_field_data(self):
         )
         assert isinstance(data_pyvista, Plotter)
 
-    @pytest.mark.skipif(sys.version_info > (3, 11), reason="Issues with VTK in Python 3.12")
     @pytest.mark.skipif(is_linux or sys.version_info < (3, 8), reason="FarFieldSolution not supported by IronPython")
     def test_71_antenna_plot(self, field_test):
         ffdata = field_test.get_antenna_ffd_solution_data(frequencies=30e9, sphere="3D")
diff --git a/pyproject.toml b/pyproject.toml
index 34b9d4df201..0b3efca32a5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,13 +55,12 @@ tests = [
     "pytest>=7.4.0,<8.3",
     "pytest-cov>=4.0.0,<5.1",
     "pytest-xdist>=3.5.0,<3.7",
-    "pyvista[io]>=0.38.0,<0.44",
+    "pyvista[io]>=0.38.0,<0.45",
     # Never directly imported but required when loading ML related file see #4713
     "scikit-learn>=1.0.0,<1.6",
     "scikit-rf>=0.30.0,<1.2",
     "SRTM.py",
     "utm",
-    "vtk==9.2.6; python_version < '3.12'",
 ]
 dotnet = [
     "ansys-pythonnet>=3.1.0rc3",
@@ -83,7 +82,7 @@ doc = [
     "osmnx>=1.1.0,<1.10",
     "pypandoc>=1.10.0,<1.14",
     #"pytest-sphinx",
-    "pyvista[io]>=0.38.0,<0.44",
+    "pyvista[io]>=0.38.0,<0.45",
     "recommonmark",
     "scikit-rf>=0.30.0,<1.2",
     "Sphinx==5.3.0; python_version == '3.7'",
@@ -99,7 +98,6 @@ doc = [
     #"sphinxcontrib-websupport",
     "SRTM.py",
     "utm",
-    "vtk==9.2.6; python_version < '3.12'",
 ]
 doc-no-examples = [
     "ansys-sphinx-theme>=0.10.0,<0.17",
@@ -125,14 +123,13 @@ all = [
     "openpyxl>=3.1.0,<3.3",
     "osmnx>=1.1.0,<1.10",
     "pandas>=1.1.0,<2.3",
-    "pyvista[io]>=0.38.0,<0.44",
+    "pyvista[io]>=0.38.0,<0.45",
     "fast-simplification>=0.1.7",
     # Never directly imported but required when loading ML related file see #4713
     "scikit-learn>=1.0.0,<1.6",
     "scikit-rf>=0.30.0,<1.2",
     "SRTM.py",
     "utm",
-    "vtk==9.2.6; python_version < '3.12'",
 ]
 installer = [
     "matplotlib>=3.5.0,<3.10",
@@ -140,13 +137,12 @@ installer = [
     "openpyxl>=3.1.0,<3.3",
     "osmnx>=1.1.0,<1.10",
     "pandas>=1.1.0,<2.3",
-    "pyvista[io]>=0.38.0,<0.44",
+    "pyvista[io]>=0.38.0,<0.45",
     # Never directly imported but required when loading ML related file see #4713
     "scikit-learn>=1.0.0,<1.6",
     "scikit-rf>=0.30.0,<1.2",
     "SRTM.py",
     "utm",
-    "vtk==9.2.6; python_version < '3.12'",
     "jupyterlab>=3.6.0,<4.3",
     "ipython>=7.30.0,<8.27",
     "ipyvtklink>=0.2.0,<0.2.4",