Skip to content

Commit f9e9ec2

Browse files
committed
Merge branch 'main' into release/0.52
2 parents 9fc17e7 + aa1501d commit f9e9ec2

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

ansys/mapdl/reader/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
import appdirs
44

55
# Per contract with Sphinx-Gallery, this method must be available at top level
6-
from pyvista.utilities.sphinx_gallery import _get_sg_image_scraper
6+
try:
7+
# for pyvista >= 0.40
8+
from pyvista.plotting.utilities import _get_sg_image_scraper
9+
except ImportError:
10+
from pyvista.utilities.sphinx_gallery import _get_sg_image_scraper
11+
712

813
from ansys.mapdl.reader import examples
914
from ansys.mapdl.reader._version import __version__

ansys/mapdl/reader/misc.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66

77
import numpy as np
88
import pyvista
9-
from pyvista.utilities.errors import GPUInfo
9+
10+
try:
11+
# for pyvista >= 0.40
12+
from pyvista.report import GPUInfo
13+
except ImportError:
14+
from pyvista.utilities.errors import GPUInfo
15+
1016
import scooby
1117

1218

requirements/requirements_doc.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
Sphinx<8
22
ansys-sphinx-theme==0.9.9
33
imageio==2.31.1
4+
nest-asyncio==1.5.6
45
notfound==1.0.2
56
pypandoc==1.11
6-
pyvista==0.39.1
7+
pyvista==0.40.0
78
sphinx-copybutton==0.5.2
89
sphinx-gallery==0.13.0
910
sphinx-notfound-page==0.8.3
11+
trame==2.5.0
1012
vtk==9.2.6

requirements/requirements_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ansys-mapdl-core>=0.60.4
22
matplotlib>=3.5.3
3-
pytest==7.3.2
3+
pytest==7.4.0
44
pytest-cov==4.1.0
55
scipy>=1.7.3

0 commit comments

Comments
 (0)