Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/imageio-2.31.5
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 authored Oct 6, 2023
2 parents cf80352 + b721ba5 commit ca7beb2
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
doc-style:
name: "Documentation style check"
runs-on: ubuntu-latest
#Skipping until 2394 is fixed
if: github.ref == 'Skip for now'
steps:
- name: "Ansys documentation style checks"
uses: ansys/actions/doc-style@v4
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
- id: flake8

- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
rev: v2.2.6
hooks:
- id: codespell
args: ["--toml", "pyproject.toml"]
Expand All @@ -47,6 +47,6 @@ repos:

# this validates our github workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.26.3
rev: 0.27.0
hooks:
- id: check-github-workflows
3 changes: 3 additions & 0 deletions doc/styles/Vocab/ANSYS/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ MacOS
MAPDL
mater
MATLAB
matricies
mesher
midside
Mises
Expand All @@ -93,12 +94,14 @@ nce
Newton-Raphson
nin
nonlinearities
NORML
NumPy
onefile
optiSLang
parm
performant
PMLs
POIN
Poisson
postprocessor
Prasanna
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,4 @@ show_missing = true
skip = '*.pyc,*.txt,*.gif,*.png,*.jpg,*.js,*.html,*.doctree,*.ttf,*.woff,*.woff2,*.eot,*.mp4,*.inv,*.pickle,*.ipynb,flycheck*,./.git/*,./.hypothesis/*,*.yml,./doc/build/*,./doc/images/*,./dist/*,*~,.hypothesis*,./doc/source/examples/*,*cover,*.dat,*.mac,build,./docker/mapdl/v*,./factory/*,./ansys/mapdl/core/mapdl_functions.py,PKG-INFO,*.mypy_cache/*,./docker/mapdl/*,./_unused/*'
ignore-words = "doc/styles/Vocab/ANSYS/accept.txt"
quiet-level = 3
ignore-regex=".*codespell-ignore$|NORML|POIN"
2 changes: 1 addition & 1 deletion src/ansys/mapdl/core/_commands/post1_/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ def sumtype(self, label="", **kwargs):
sessions.
SUMTYPE,PRIN also causes principal nodal values to be the average of
the contibuting principal element nodal values (see AVPRIN,1).
the contributing principal element nodal values (see AVPRIN,1).
BEAM188 and BEAM189 elements compute principal stress, equivalent
stress, and stress intensity values on request instead of storing them
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/mapdl/core/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ def _validate_MPI(add_sw, exec_path, force_intel=False):
):
# Workaround to fix a problem when launching ansys in 'dmp' mode in the
# recent windows version and using VPN.
# This is due to the intel compiler, and only afects versions between
# This is due to the intel compiler, and only affects versions between
# 210 and 222.
#
# There doesn't appear to be an easy way to check if we
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/mapdl/core/mesh/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
7: "QUAD",
8: "TRI6",
9: "QUA8",
10: "POIN",
10: "POIN", # codespell-ignore
11: "CIRC",
12: "",
13: "",
Expand Down
6 changes: 6 additions & 0 deletions tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ def db(mapdl):
f"This MAPDL version ({mapdl_version}) is not compatible with the Database module."
)

## Exceptions
# Exception for 22.2
if mapdl_version == "22.2" and ON_CI:
pytest.skip(
f"This MAPDL version ({mapdl_version}) docker image seems to not support DB, but local does."
)

if mapdl_version == "24.1":
pytest.skip(
f"This MAPDL version ({mapdl_version}) does not support PyMAPDL Database."
)

if mapdl._server_version < (0, 4, 1): # 2021R2
ver_ = ".".join([str(each) for each in mapdl._server_version])
pytest.skip(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_mesh_grpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def test_tshape_key(mapdl, contact_geom_and_mesh):


def test_save(mapdl, cube_geom_and_mesh):
# This test seems to fail when paralelized.
# This test seems to fail when parallelized.
fname = "mesh.vtk"
for binary_ in [True, False]:
mapdl.mesh.save(fname, binary_)
Expand Down

0 comments on commit ca7beb2

Please sign in to comment.