Merge branch 'main' into release/0.7

ansys · Dec 22, 2023 · 38f32a5 · 38f32a5
2 parents 07058ea + 0e2e1c2
commit 38f32a5
Show file tree

Hide file tree

Showing 58 changed files with 1,465 additions and 388 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,22 +1,12 @@
 documentation:
-- doc/source/**/*
-- README.md
-- README_CN.md
+- any-glob-to-any-file: ["doc/source/**/*", "README.md", "README_CN.md"]
 maintenance:
-- .github/**/*
-- .flake8
-- setup.py
-- setup-distutils.py
+- any-glob-to-any-file: [".github/**/*", ".flake8", "pyproject.toml"]
 dependencies:
-- requirements/**/*
+- any-glob-to-any-file: [requirements/**/*]
 testing:
-- _unittest/conftest.py
-- _unittest_ironpython/run_unittests.py
-- _unittest_ironpython/run_unittests_batchmode.cmd
+- any-glob-to-any-file: ["_unittest/conftest.py", "_unittest_ironpython/run_unittests.py", "_unittest_ironpython/run_unittests_batchmode.cmd"]
 # TODO : Remove once EDB is extracted from PyAEDT
 edb:
-- examples/00-EDB/**
-- examples/01-HFSS3DLayout/EDB_in_3DLayout.py
-- examples/05-Q3D/Q3D_from_EDB.py
-- pyaedt/edb_core/**
-- pyaedt/edb.py
+- any-glob-to-any-file: ["examples/00-EDB/**", "examples/01-HFSS3DLayout/EDB_in_3DLayout.py", "examples/05-Q3D/Q3D_from_EDB.py", "pyaedt/edb_core/**", "pyaedt/edb.py"]
+
diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check documentation style"
-        uses: ansys/actions/doc-style@v4
+        uses: ansys/actions/doc-style@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           vale-config: "doc/.vale.ini"
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 

diff --git a/.github/workflows/cpython_linux.yml b/.github/workflows/cpython_linux.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x86'
@@ -84,7 +84,7 @@ jobs:
             pytest --tx 2*popen --durations=50  --dist loadfile -v _unittest_solvers
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results
           path: junit/test-results.xml

diff --git a/.github/workflows/full_documentation.yml b/.github/workflows/full_documentation.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -79,21 +79,21 @@ jobs:
 #            .\doc\make.bat pdf
 
       - name: Upload HTML documentation artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: documentation-html
           path: doc/_build/html
           retention-days: 7
 
       - name: Upload HTML documentation artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: documentation-html-edb
           path: doc/_build/html/EDBAPI
           retention-days: 7
 
 #      - name: Upload PDF documentation artifact
-#        uses: actions/upload-artifact@v3
+#        uses: actions/upload-artifact@v4
 #        with:
 #          name: documentation-pdf
 #          path: doc/_build/pdf
@@ -114,7 +114,7 @@ jobs:
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
     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 }}
@@ -129,13 +129,13 @@ jobs:
 
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: Display structure of downloaded files
         run: ls -R
@@ -153,7 +153,7 @@ jobs:
           echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
 
       - name: "Deploy the stable documentation index for PyAEDT API"
-        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 }}
@@ -162,7 +162,7 @@ jobs:
           pymeilisearchopts: --stop_urls \"EDBAPI\" # Add EDB API as another index.
 
       - name: "Deploy the stable documentation index for EDB API"
-        uses: ansys/actions/doc-deploy-index@v4
+        uses: ansys/actions/doc-deploy-index@v5
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}/EDBAPI/
           index-name: pyedb-v${{ env.VERSION_MEILI }}

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -32,10 +32,9 @@ jobs:
 
     # Label based on modified files
     - name: Label based on changed files
-      uses: actions/labeler@v4
+      uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: ''
 
     # Label based on branch name
     - uses: actions-ecosystem/action-add-labels@v1

diff --git a/.github/workflows/nightly-docs.yml b/.github/workflows/nightly-docs.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 
@@ -39,14 +39,14 @@ jobs:
           make -C doc phtml
 
       - name: Upload documentation HTML artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: documentation-html
           path: doc/_build/html
           retention-days: 7
 
       - name: Upload HTML documentation artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: documentation-html-edb
           path: doc/_build/html/EDBAPI
@@ -58,7 +58,7 @@ jobs:
     steps:
 
       - name: Deploy 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 }}
@@ -70,13 +70,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
 
       - name: Display structure of downloaded files
         run: ls -R
 
       - name: "Deploy the dev documentation index for PyAEDT API"
-        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
@@ -85,7 +85,7 @@ jobs:
           pymeilisearchopts: --stop_urls \"EDBAPI\" # Add EDB API as another index to show it in dropdown button
 
       - name: "Deploy the dev documentation index for EDB API"
-        uses: ansys/actions/doc-deploy-index@v4
+        uses: ansys/actions/doc-deploy-index@v5
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}/version/dev/EDBAPI/
           index-name: pyedb-vdev

diff --git a/.github/workflows/unit_test_prerelease.yml b/.github/workflows/unit_test_prerelease.yml
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -80,7 +80,7 @@ jobs:
         name: 'Upload coverage to Codecov'
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results
           path: junit/test-results.xml

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -83,9 +83,9 @@ jobs:
           name: 'Upload coverage to Codecov'
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: pytest-results
+          name: pytest-solver-results
           path: junit/test-results.xml
         # Use always() to always run this step to publish test results when there are test failures
         if: ${{ always() }}
@@ -101,7 +101,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -146,7 +146,7 @@ jobs:
           name: 'Upload coverage to Codecov'
 
       - name: Upload pytest test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results
           path: junit/test-results.xml

diff --git a/.github/workflows/wheelhouse.yml b/.github/workflows/wheelhouse.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -75,7 +75,7 @@ jobs:
           dest: ${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-${{ runner.os }}-${{ matrix.python-version }}.zip
 
       - name: Upload Wheelhouse
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-${{ runner.os }}-${{ matrix.python-version }}
           path: '*.zip'

diff --git a/.github/workflows/wheelhouse_linux.yml b/.github/workflows/wheelhouse_linux.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -74,7 +74,7 @@ jobs:
           dest: ${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-wheelhouse-${{ runner.os }}-${{ matrix.python-version }}.zip
 
       - name: Upload Wheelhouse
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-wheelhouse-${{ runner.os }}-${{ matrix.python-version }}
           path: '*.zip'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,14 +17,14 @@ exclude: |
 
 repos:
 - repo: https://github.com/psf/black
-  rev: 23.11.0  # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
+  rev: 23.12.0  # IF VERSION CHANGES --> MODIFY "blacken-docs" MANUALLY AS WELL!!
   hooks:
   - id: black
     args:
       - --line-length=120
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.12.0
+  rev: 5.13.2
   hooks:
     - id: isort
       name: isort (python)
@@ -53,15 +53,15 @@ repos:
 
 # validate GitHub workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.27.2
+  rev: 0.27.3
   hooks:
     - id: check-github-workflows
 
 - repo: https://github.com/asottile/blacken-docs
   rev: 1.16.0
   hooks:
   -   id: blacken-docs
-      additional_dependencies: [black==23.11.0]
+      additional_dependencies: [black==23.12.0]
 
 
 # - repo: https://github.com/numpy/numpydoc

diff --git a/_unittest/example_models/T12/coax_setup_solved_231.aedtz b/_unittest/example_models/T12/coax_setup_solved_231.aedtz
diff --git a/_unittest/example_models/TEDB/test_merge_polygon.aedb/edb.def b/_unittest/example_models/TEDB/test_merge_polygon.aedb/edb.def