Skip to content

Commit

Permalink
chore: Merge branch 'main' into fix/not-deleting-ansys-tmp-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 committed Jul 8, 2024
2 parents 49a7a20 + 5a993db commit 3dd2f4b
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 47 deletions.
3 changes: 2 additions & 1 deletion .ci/build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ versions=(
# if added more "latest", change "$LATEST"
'latest-ubuntu'
'latest-ubuntu-student'
'v25.1.0'
'v24.2.0'
'v24.2-ubuntu'
'v24.2-ubuntu-student'
Expand All @@ -19,7 +20,7 @@ versions=(
'v22.2-ubuntu'
)

LATEST=2 # for 'latest-ubuntu' and 'latest-ubuntu-student'
LATEST=3 # for 'latest-ubuntu' and 'latest-ubuntu-student'

# Run only ubuntu jobs
ONLY_UBUNTU="${ONLY_UBUNTU:-false}"
Expand Down
16 changes: 8 additions & 8 deletions .devcontainer/codespaces-dev/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ansys-dpf-core==0.10.1
autopep8==2.2.0
autopep8==2.3.1
matplotlib==3.9.0
scipy==1.13.1
pandas==2.2.2
pyansys-tools-report==0.7.3
pyiges[full]==0.3.1
pytest==8.2.1
pytest-cov==5.0.0
pyvista==0.43.8
pyansys-tools-report==0.7.3
vtk==9.3.0
pytest-rerunfailures==14.0
pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-timeout==2.3.1
pytest-rerunfailures==14.0
pytest==8.2.2
pyvista==0.43.10
scipy==1.14.0
vtk==9.3.0
18 changes: 10 additions & 8 deletions .devcontainer/codespaces-docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
sphinx==7.3.7
ansys-dpf-core==0.10.1
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.4
grpcio==1.64.0
imageio-ffmpeg==0.4.9
imageio==2.34.1
ansys-sphinx-theme==0.16.6
grpcio==1.64.1
imageio-ffmpeg==0.5.1
imageio==2.34.2
jupyter_sphinx==0.5.3
jupyterlab>=3.2.8
matplotlib==3.9.0
Expand All @@ -15,13 +14,16 @@ pyiges[full]==0.3.1
pypandoc==1.13
pytest-sphinx==0.6.3
pythreejs==2.4.2
pyvista[trame]==0.43.8
pyvista[trame]==0.43.10
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.0
sphinx-design==0.6.0
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-reredirects==0.1.4
sphinx==7.3.7
sphinxcontrib-websupport==1.2.7
sphinxemoji==0.3.1
sphinx-reredirects==0.1.3
vtk==9.3.0
sphinx-design==0.6.0
38 changes: 30 additions & 8 deletions .devcontainer/devcontainer-local/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
ansys-dpf-core==0.10.1
autopep8==2.2.0
ansys-mapdl-reader==0.53.0
ansys-sphinx-theme==0.16.6
autopep8==2.3.1
grpcio==1.64.1
imageio-ffmpeg==0.5.1
imageio==2.34.2
jupyter_sphinx==0.5.3
jupyterlab>=3.2.8
matplotlib==3.9.0
scipy==1.13.1
numpydoc==1.7.0
pandas==2.2.2
plotly==5.22.0
pyansys-tools-report==0.7.3
pyiges[full]==0.3.1
pytest==8.2.1
pypandoc==1.13
pytest-cov==5.0.0
pyvista==0.43.8
pyansys-tools-report==0.7.3
vtk==9.3.0
pytest-rerunfailures==14.0
pytest-memprof<0.3.0
pytest-pyvista==0.1.9
pytest-timeout==2.3.1
pytest-rerunfailures==14.0
pytest-sphinx==0.6.3
pytest==8.2.2
pythreejs==2.4.2
pyvista[jupyter]==0.43.10
pyvista==0.43.10
scipy==1.14.0
sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.25.2
sphinx-copybutton==0.5.2
sphinx-design==0.6.0
sphinx-gallery==0.16.0
sphinx-notfound-page==1.0.2
sphinx-reredirects==0.1.4
sphinx==7.3.7
sphinxcontrib-websupport==1.2.7
sphinxemoji==0.3.1
1 change: 1 addition & 0 deletions doc/changelog.d/3210.miscellaneous.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ci: Adding v251 CentOS based image to testing
1 change: 1 addition & 0 deletions doc/changelog.d/3217.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: update requirements in devcontainer directory
1 change: 1 addition & 0 deletions doc/changelog.d/3224.dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build: removing reredirect sphinx extension
9 changes: 0 additions & 9 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"sphinx_gallery.gen_gallery",
"sphinxemoji.sphinxemoji",
"sphinx.ext.graphviz",
"sphinx_reredirects",
"ansys_sphinx_theme.extension.linkcode",
]

Expand Down Expand Up @@ -203,14 +202,6 @@
with open("substitutions.rst") as f:
rst_epilog += f.read()


# Setting redicts
redirects = {
#
# Old link: https://dev.mapdl.docs.pyansys.com/user_guide/krylov.html
"user_guide/krylov": "examples/extended_examples/Krylov/krylov_example"
}

# Broken anchors:
linkcheck_exclude_documents = ["index"]
linkcheck_anchors_ignore_for_url = ["https://docs.pyvista.org/api/*"]
Expand Down
23 changes: 11 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ dependencies = [
"ansys-mapdl-reader>=0.51.7",
"ansys-math-core>=0.1.2",
"ansys-platform-instancemanagement~=1.0",
"platformdirs>=3.6.0",
"ansys-tools-path>=0.3.1",
"click>=8.1.3", # for CLI interface
"tabulate>=0.8.0", # for cli plotting
"grpcio>=1.30.0", # tested up to grpcio==1.35
"importlib-metadata>=4.0",
"matplotlib>=3.0.0", # for colormaps for pyvista
"numpy>=1.14.0,<1.25.0; python_version < '3.9'",
"numpy>=1.14.0,<2.0.0; python_version >= '3.9'",
"pexpect>=4.8.0 ; platform_system=='Linux'",
"platformdirs>=3.6.0",
"protobuf>=3.12.2", # minimum required based on latest ansys-grpc-mapdl
"psutil>=5.9.4",
"pyansys-tools-versioning>=0.3.3",
"ansys-tools-path>=0.3.1",
"pyiges[full]>=0.3.1", # Since v0.3.0, the 'full' flag is needed in order to install 'geomdl'
"pyvista>=0.38.1",
"scipy>=1.3.0", # for sparse (consider optional?)
"tabulate>=0.8.0", # for cli plotting
"tqdm>=4.45.0",
"vtk>=9.0.0",
]
Expand Down Expand Up @@ -61,20 +61,19 @@ tests = [
"ansys-dpf-core==0.10.1",
"autopep8==2.3.1",
"matplotlib==3.9.1",
"scipy==1.14.0",
"pandas==2.2.2",
"pyansys-tools-report==0.7.3",
"pyiges[full]==0.3.1",
"pytest==8.2.2",
"pytest-cov==5.0.0",
"pytest-memprof<0.3.0",
"pytest-pyvista==0.1.9",
"pytest-rerunfailures==14.0",
"pytest==8.2.2",
"pyvista==0.43.10",
"pyansys-tools-report==0.7.3",
"scipy==1.14.0",
"vtk==9.3.1",
"pytest-rerunfailures==14.0",
"pytest-pyvista==0.1.9",
"pytest-memprof<0.3.0",
]
doc = [
"sphinx==7.3.7",
"ansys-dpf-core==0.10.1",
"ansys-mapdl-reader==0.53.0",
"ansys-sphinx-theme==0.16.6",
Expand All @@ -91,16 +90,16 @@ doc = [
"pypandoc==1.13",
"pytest-sphinx==0.6.3",
"pythreejs==2.4.2",
"pyvista[trame]==0.43.10",
"pyvista[jupyter]==0.43.10",
"sphinx-autobuild==2024.4.16",
"sphinx-autodoc-typehints==1.25.2",
"sphinx-copybutton==0.5.2",
"sphinx-design==0.6.0",
"sphinx-gallery==0.16.0",
"sphinx-notfound-page==1.0.2",
"sphinx==7.3.7",
"sphinxcontrib-websupport==1.2.7",
"sphinxemoji==0.3.1",
"sphinx-reredirects==0.1.4",
"vtk==9.3.1",
]

Expand Down
2 changes: 1 addition & 1 deletion tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def db(mapdl):
f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
)

if mapdl_version == "24.1" or mapdl_version == "24.2":
if mapdl_version in ["24.1", "24.2", "25.1"]:
pytest.skip(
f"This MAPDL version ({mapdl_version}) does not support PyMAPDL Database."
)
Expand Down

0 comments on commit 3dd2f4b

Please sign in to comment.