Skip to content

Commit f01a317

Browse files
authored
Merge branch 'main' into dependabot/pip/pytest-rerunfailures-15.0
2 parents 767e52f + 012b7a3 commit f01a317

File tree

16 files changed

+544
-94
lines changed

16 files changed

+544
-94
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
exclude = venv, __init__.py, doc/_build, .venv
2+
exclude = venv, __init__.py, doc/_build, .venv, tests/customized_functions/*
33
select = W191, W291, W293, W391, E115, E117, E122, E124, E125, E225, E301, E303, E501, F401, F403
44
count = True
55
max-complexity = 10

_package/.pre-commit-config.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
fail_fast: True
2+
3+
ci:
4+
# Commit name when auto fixing PRs.
5+
autofix_commit_msg: |
6+
ci: auto fixes from pre-commit.com hooks.
7+
8+
for more information, see https://pre-commit.ci
9+
10+
# PR name when autoupdate
11+
autoupdate_commit_msg: 'ci: pre-commit autoupdate'
12+
13+
14+
repos:
15+
16+
- repo: https://github.com/pycqa/isort
17+
rev: 5.13.2
18+
hooks:
19+
- id: isort
20+
21+
- repo: https://github.com/numpy/numpydoc
22+
rev: v1.8.0
23+
hooks:
24+
- id: numpydoc-validation
25+
exclude: |
26+
(?x)(
27+
tests/|
28+
examples|
29+
doc/source/|
30+
src/ansys/mapdl/core/_commands|
31+
src/ansys/mapdl/core/commands
32+
)
33+
34+
- repo: https://github.com/psf/black
35+
rev: 24.10.0 # If version changes --> modify "blacken-docs" manually as well.
36+
hooks:
37+
- id: black
38+
args:
39+
- --line-length=88
40+
41+
- repo: https://github.com/adamchainz/blacken-docs
42+
rev: 1.19.0
43+
hooks:
44+
- id: blacken-docs
45+
additional_dependencies: [black==24.10.0]
46+
47+
- repo: https://github.com/PyCQA/flake8
48+
rev: 7.1.1
49+
hooks:
50+
- id: flake8
51+
52+
- repo: https://github.com/codespell-project/codespell
53+
rev: v2.3.0
54+
hooks:
55+
- id: codespell
56+
args: ["--toml", "pyproject.toml"]
57+
additional_dependencies: ["tomli"]
58+
59+
# - repo: https://github.com/pycqa/pydocstyle
60+
# rev: 6.1.1
61+
# hooks:
62+
# - id: pydocstyle
63+
# additional_dependencies: [toml]
64+
# exclude: "tests/"
65+
66+
- repo: https://github.com/pre-commit/pre-commit-hooks
67+
rev: v5.0.0
68+
hooks:
69+
- id: check-merge-conflict
70+
- id: debug-statements
71+
72+
# this validates our github workflow files
73+
- repo: https://github.com/python-jsonschema/check-jsonschema
74+
rev: 0.29.4
75+
hooks:
76+
- id: check-github-workflows

config.yaml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ library_name_structured: # Future name of the library
22
- pyconverter
33
- generatedcommands
44

5+
subfolder:
6+
- subfolder
7+
- subsubfolder
8+
59
new_package_name: package
610

711
rules:
@@ -11,6 +15,25 @@ rules:
1115
specific_command_mapping:
1216
"*DEL": stardel
1317
"C***": c
18+
"/INQUIRE": inquire
19+
20+
ignored_commands:
21+
- "*VWR"
22+
- "*MWR"
23+
- "C***"
24+
- "*CFO"
25+
- "*CRE"
26+
- "*END"
27+
- "/EOF"
28+
- "*ASK"
29+
- "*IF"
30+
- "*ELSE"
31+
- "CMAT"
32+
- "*REP"
33+
- "*RETURN"
34+
- "LSRE"
35+
1436

1537
specific_classes:
16-
2D to 3D Analysis: Analysis 2D to 3D
38+
2D to 3D Analysis: Analysis 2D to 3D
39+
Parameters: Parameter definition

doc/source/conf.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
copyright = f"(c) {datetime.now().year} ANSYS, Inc. All rights reserved"
1111
author = "ANSYS, Inc."
1212
release = version = __version__
13-
cname = os.getenv("DOCUMENTATION_CNAME", "<DEFAULT_CNAME>")
13+
cname = os.getenv("DOCUMENTATION_CNAME", "pyconverter-xml2py.docs.pyansys.com")
1414
switcher_version = get_version_match(__version__)
1515

1616
REPOSITORY_NAME = "pyconverter-xml2py"
@@ -38,7 +38,7 @@
3838
"icon_links": [
3939
{
4040
"name": "Support",
41-
"url": "https://github.com/ansys/pyconverter-xml2py/discussions",
41+
"url": f"https://github.com/{USERNAME}/{REPOSITORY_NAME}/discussions",
4242
"icon": "fa fa-comment fa-fw",
4343
},
4444
],
@@ -54,9 +54,9 @@
5454

5555
html_context = {
5656
"display_github": True, # Integrate GitHub
57-
"github_user": "ansys",
57+
"github_user": USERNAME,
5858
"github_repo": REPOSITORY_NAME,
59-
"github_version": "main",
59+
"github_version": BRANCH,
6060
"doc_path": "doc/source",
6161
}
6262

@@ -65,13 +65,13 @@
6565
"ansys_sphinx_theme.extension.autoapi",
6666
"jupyter_sphinx",
6767
"numpydoc",
68-
"sphinx.ext.autodoc",
6968
"sphinx_autodoc_typehints",
70-
"sphinx.ext.intersphinx",
71-
"sphinx.ext.extlinks",
72-
"sphinx.ext.graphviz",
7369
"sphinx_copybutton",
7470
"sphinx_design",
71+
"sphinx.ext.autodoc",
72+
"sphinx.ext.extlinks",
73+
"sphinx.ext.graphviz",
74+
"sphinx.ext.intersphinx",
7575
]
7676

7777
# Intersphinx mapping

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ tests = [
4848
"lxml==5.3.0",
4949
"numpy==2.1.3",
5050
"parse==1.20.2",
51-
"pytest==8.3.3",
51+
"pytest==8.3.4",
5252
"pytest-cov==6.0.0",
5353
"pytest-rerunfailures==15.0",
5454
"pyyaml==6.0.2",

0 commit comments

Comments
 (0)