Merge branch 'main' into release/0.52

ansys · Jul 7, 2023 · f9e9ec2 · f9e9ec2
2 parents 9fc17e7 + aa1501d
commit f9e9ec2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/ansys/mapdl/reader/__init__.py b/ansys/mapdl/reader/__init__.py
@@ -3,7 +3,12 @@
 import appdirs
 
 # Per contract with Sphinx-Gallery, this method must be available at top level
-from pyvista.utilities.sphinx_gallery import _get_sg_image_scraper
+try:
+    # for pyvista >= 0.40
+    from pyvista.plotting.utilities import _get_sg_image_scraper
+except ImportError:
+    from pyvista.utilities.sphinx_gallery import _get_sg_image_scraper
+
 
 from ansys.mapdl.reader import examples
 from ansys.mapdl.reader._version import __version__

diff --git a/ansys/mapdl/reader/misc.py b/ansys/mapdl/reader/misc.py
@@ -6,7 +6,13 @@
 
 import numpy as np
 import pyvista
-from pyvista.utilities.errors import GPUInfo
+
+try:
+    # for pyvista >= 0.40
+    from pyvista.report import GPUInfo
+except ImportError:
+    from pyvista.utilities.errors import GPUInfo
+
 import scooby
 
 

diff --git a/requirements/requirements_doc.txt b/requirements/requirements_doc.txt
@@ -1,10 +1,12 @@
 Sphinx<8
 ansys-sphinx-theme==0.9.9
 imageio==2.31.1
+nest-asyncio==1.5.6
 notfound==1.0.2
 pypandoc==1.11
-pyvista==0.39.1
+pyvista==0.40.0
 sphinx-copybutton==0.5.2
 sphinx-gallery==0.13.0
 sphinx-notfound-page==0.8.3
+trame==2.5.0
 vtk==9.2.6
diff --git a/requirements/requirements_test.txt b/requirements/requirements_test.txt
@@ -1,5 +1,5 @@
 ansys-mapdl-core>=0.60.4
 matplotlib>=3.5.3
-pytest==7.3.2
+pytest==7.4.0
 pytest-cov==4.1.0
 scipy>=1.7.3