Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/pypa/cibuildwheel-…
Browse files Browse the repository at this point in the history
…2.15.0
  • Loading branch information
clatapie authored Aug 16, 2023
2 parents 44f4547 + d4a0cf4 commit 5756b61
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@

# Intersphinx mapping
intersphinx_mapping = {
"python": ("https://docs.python.org/dev", None),
"python": ("https://docs.python.org/3/", None),
"scipy": ("https://docs.scipy.org/doc/scipy/", None),
"numpy": ("https://numpy.org/devdocs", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"matplotlib": ("https://matplotlib.org/stable", None),
"pandas": ("https://pandas.pydata.org/pandas-docs/stable", None),
"pyvista": ("https://docs.pyvista.org/", None),
"pandas": ("http://pandas.pydata.org/pandas-docs/stable/", None),
"pyvista": ("https://docs.pyvista.org/version/stable/", None),
"grpc": ("https://grpc.github.io/grpc/python/", None),
"pypim": ("https://pypim.docs.pyansys.com/", None),
"pypim": ("https://pypim.docs.pyansys.com/version/stable/", None),
}

# Add any paths that contain templates here, relative to this directory.
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements_doc.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Sphinx<8
ansys-sphinx-theme==0.10.0
ansys-sphinx-theme==0.10.3
imageio==2.31.1
nest-asyncio==1.5.7
notfound==1.0.2
Expand Down
6 changes: 3 additions & 3 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def mapdl(request):
"""This fixture will only be called if ``ansys.mapdl.core`` is installed."""
from ansys.mapdl.core import launch_mapdl
from ansys.mapdl.core.launcher import get_start_instance
from ansys.mapdl.core.misc import get_ansys_bin
from ansys.tools.path import get_mapdl_path

# check if the user wants to permit pytest to start MAPDL
# and don't allow mapdl to exit upon collection unless mapdl is local
Expand All @@ -22,8 +22,8 @@ def mapdl(request):
valid_rver = ["211"] # checks in this order
EXEC_FILE = None
for rver in valid_rver:
if os.path.isfile(get_ansys_bin(rver)):
EXEC_FILE = get_ansys_bin(rver)
if os.path.isfile(get_mapdl_path(rver)):
EXEC_FILE = get_mapdl_path(rver)
break

return launch_mapdl(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_rst.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def test_plot_nodal_thermal_strain():

@skip_plotting
@pytest.mark.skipif(vm33 is None, reason="Requires example files")
def test_plot_nodal_thermal_strain():
def test_animate_time_solution():
vm33._animate_time_solution("ENS", off_screen=True)


Expand Down

0 comments on commit 5756b61

Please sign in to comment.