Skip to content

Commit

Permalink
Merge branch 'main' into release/0.11
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/ansys/aedt/core/__init__.py
  • Loading branch information
Samuelopez-ansys committed Oct 18, 2024
2 parents 267c5f0 + d305939 commit 5554c05
Show file tree
Hide file tree
Showing 80 changed files with 2,123 additions and 1,020 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check documentation style
uses: ansys/actions/doc-style@v6
uses: ansys/actions/doc-style@v8
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -115,8 +115,8 @@ jobs:
run: |
python doc/print_errors.py
- name: Upload HTML documentation without artifact
uses: actions/upload-artifact@v3
- name: Upload HTML documentation
uses: actions/upload-artifact@v4
with:
name: documentation-html
path: doc/_build/html
Expand All @@ -127,7 +127,7 @@ jobs:
make -C doc pdf
- name: Upload PDF documentation
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation-pdf
path: doc/_build/latex/PyAEDT-Documentation-*.pdf
Expand Down Expand Up @@ -187,9 +187,9 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
name: pytest-solver-windows
path: junit/test-results.xml
if: ${{ always() }}

Expand Down Expand Up @@ -245,9 +245,9 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
name: pytest-solver-linux
path: junit/test-results.xml
if: ${{ always() }}

Expand Down Expand Up @@ -310,9 +310,9 @@ jobs:
flags: system

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-results
name: pytest-windows
path: junit/test-results.xml
if: ${{ always() }}

Expand Down Expand Up @@ -380,9 +380,9 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
name: pytest-linux
path: junit/test-results.xml
if: ${{ always() }}

Expand Down Expand Up @@ -423,7 +423,7 @@ jobs:
needs: [release]
steps:
- name: Deploy the stable documentation
uses: ansys/actions/doc-deploy-stable@v4
uses: ansys/actions/doc-deploy-stable@v5
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -453,7 +453,7 @@ jobs:
echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
- name: Deploy the latest documentation index
uses: ansys/actions/doc-deploy-index@v4
uses: ansys/actions/doc-deploy-index@v5
with:
cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}
index-name: pyaedt-v${{ env.VERSION_MEILI }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/manual_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
path: junit/test-results.xml
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
path: junit/test-results.xml
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
flags: system

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-results
path: junit/test-results.xml
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
flags: system,solver

- name: Upload pytest test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pytest-solver-results
path: junit/test-results.xml
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
jobs:

doc-build:
name: Documentation build with examples
name: Documentation build
runs-on: [ self-hosted, Windows, pyaedt ]
timeout-minutes: 720
steps:
Expand Down Expand Up @@ -91,14 +91,14 @@ jobs:
# cp doc/_build/latex/PyAEDT-Documentation-*.pdf ./doc/_build/html/_static/assets/download/pyaedt.pdf

- name: Upload HTML documentation with examples artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation-html
path: doc/_build/html
retention-days: 7

- name: Upload PDF documentation without examples artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation-pdf
path: doc/_build/latex/PyAEDT-Documentation-*.pdf
Expand All @@ -110,7 +110,7 @@ jobs:
needs: doc-build
steps:
- name: Upload development documentation
uses: ansys/actions/doc-deploy-dev@v4
uses: ansys/actions/doc-deploy-dev@v5
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -122,7 +122,7 @@ jobs:
needs: upload-dev-doc
steps:
- name: Deploy the latest documentation index
uses: ansys/actions/doc-deploy-index@v4
uses: ansys/actions/doc-deploy-index@v5
with:
cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev
index-name: pyaedt-vdev
Expand Down
20 changes: 15 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
ci:
autofix_commit_msg: |
CHORE: Auto fixes from pre-commit.com hooks
For more information, see https://pre-commit.ci
autofix_prs: true
autoupdate_branch: 'chore/pre-commit-autoupdate'
autoupdate_commit_msg: 'CHORE: Pre-commit automatic update'
autoupdate_schedule: weekly

files: |
(?x)(
^src/ansys/aedt/core/|
Expand All @@ -12,7 +22,7 @@ exclude: |
repos:
- repo: https://github.com/psf/black
rev: 24.8.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
rev: 24.10.0 # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
hooks:
- id: black
args:
Expand Down Expand Up @@ -41,22 +51,22 @@ repos:
- tomli

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: debug-statements
- id: trailing-whitespace

# validate GitHub workflow files
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.3
rev: 0.29.4
hooks:
- id: check-github-workflows

- repo: https://github.com/asottile/blacken-docs
rev: 1.18.0
rev: 1.19.0
hooks:
- id: blacken-docs
additional_dependencies: [black==24.8.0]
additional_dependencies: [black==24.10.0]

# This validates our pre-commit.ci configuration
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
* [Maxime Rey](https://github.com/MaxJPRey)
* [Sébastien Morais](https://github.com/SMoraisAnsys)
* [Matthew Young](https://github.com/myoung301)
* [Josh Salant](https://github.com/jsalant22)
* [Josh Salant](https://github.com/jsalant22)
4 changes: 0 additions & 4 deletions _unittest/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,13 @@
from ansys.aedt.core.generic.filesystem import Scratch
from ansys.aedt.core.generic.general_methods import generate_unique_name
from ansys.aedt.core.generic.general_methods import inside_desktop
from ansys.aedt.core.misc.misc import list_installed_ansysem

local_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(local_path)

# Initialize default desktop configuration
default_version = "2024.2"

if "ANSYSEM_ROOT{}".format(default_version[2:].replace(".", "")) not in list_installed_ansysem():
default_version = list_installed_ansysem()[0][12:].replace(".", "")
default_version = "20{}.{}".format(default_version[:2], default_version[-1])

if inside_desktop and "oDesktop" in dir(sys.modules["__main__"]):
default_version = sys.modules["__main__"].oDesktop.GetVersion()[0:6]
Expand Down
Binary file added _unittest/example_models/T12/EMI_RCV_251.aedtz
Binary file not shown.
Binary file modified _unittest/example_models/T12/coax_setup_solved_231.aedtz
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 5554c05

Please sign in to comment.