Merge branch 'main' into release/0.7

# Conflicts: # src/ansys/aedt/toolkits/common/__init__.py
ansys · Feb 10, 2025 · 44cafd9 · 44cafd9
2 parents a2da3ce + cfb5751
commit 44cafd9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 32 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -148,13 +148,11 @@ jobs:
           path: .cov/total-html
           name: html-total-coverage
 
-      - name: "Upload coverage report to codecov"
-        if: ${{ matrix.python-version == env.MAIN_PYTHON_VERSION }}
-        uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          file: .cov/total.xml
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          name: codecov-tests-windows
+          files: .cov/total.xml
+          flags: windows_tests
 
   tests_linux:
     name: "Linux Tests"
@@ -165,7 +163,7 @@ jobs:
     runs-on: [self-hosted, pyaedt, toolkits, Linux]
     needs: [ smoke-tests ]
     env:
-      ANSYSEM_ROOT242: '/ansys_inc/AnsysEM/v242/Linux64'
+      ANSYSEM_ROOT242: '/opt/AnsysEM/v242/Linux64'
       ANS_NODEPCHECK: '1'
     steps:
       - uses: actions/checkout@v4
@@ -193,35 +191,35 @@ jobs:
       - name: Test AEDT Common API
         timeout-minutes: 5
         run: |
-          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
           source .venv_linux/bin/activate
           pytest -v -m aedt_common_api
 
       - name: Test Common API
         timeout-minutes: 5
         run: |
-          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
           source .venv_linux/bin/activate
           pytest -v -m common_api
 
       - name: Test EDB API
         timeout-minutes: 5
         run: |
-          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
           source .venv_linux/bin/activate
           pytest -v -m edb_api
 
       - name: Test REST API
         timeout-minutes: 5
         run: |
-          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
           source .venv_linux/bin/activate
           pytest -v -m rest_api
 
       - name: Test utils
         timeout-minutes: 5
         run: |
-          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:${{ env.ANSYSEM_ROOT242 }}/Delcross:$LD_LIBRARY_PATH
+          export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT242 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
           source .venv_linux/bin/activate
           pytest -v -m utils
 

diff --git a/LICENSE b/LICENSE
@@ -1,13 +1,13 @@
 MIT License
 
-Copyright (c) 2023 ANSYS, Inc. All rights reserved.
+Copyright (c) 2023 - 2025 ANSYS, Inc. and/or its affiliates.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,32 +25,33 @@ classifiers = [
 ]
 dependencies = [
     "build==1.2.2.post1",
-    "twine==5.1.1",
-    "pyaedt>=0.10.0,<0.12",
-    "pydantic",
+    "twine==6.1.0",
+    "pyaedt>=0.12.0,<0.14",
+    "pydantic>=2.0,<2.11",
     "tomli; python_version < '3.12'",
+    "attrs<24.3.0"
 ]
 
 [project.optional-dependencies]
 all = [
-    "pyaedt[all]>=0.10.0,<0.12",
+    "pyaedt[all]>=0.12.0,<0.14",
     "flask",
-    "pyside6==6.7.3",
+    "pyside6==6.8.2.1",
     "pyqtgraph",
     "qdarkstyle",
     "pyvistaqt",
 ]
 tests = [
-    "pyaedt[all]>=0.10.0,<0.12",
+    "pyaedt[all]>=0.12.0,<0.14",
     "flask",
     "pytest>=7.4.0,<8.4",
     "pytest-cov>=4.0.0,<6.1",
 ]
 doc = [
-    "pyaedt[all]>=0.10.0,<0.12",
+    "pyaedt[all]>=0.12.0,<0.14",
     "recommonmark>=0.7.0,<0.8",
-    "pyside6==6.7.3",
-    "ansys-sphinx-theme>=0.10.0,<1.3",
+    "pyside6==6.8.2.1",
+    "ansys-sphinx-theme>=0.10.0,<1.4",
     "numpydoc>=1.5.0,<1.9",
     "Sphinx>=7.1.0,<8.2",
     "sphinx-copybutton>=0.5.0,<0.6",
@@ -59,9 +60,9 @@ doc = [
     "nbsphinx>=0.9.0,<0.10",
     "sphinx_design",
     "jupytext",
-    "ipython>=8.13.0,<8.30",
+    "ipython>=8.13.0,<8.33",
     "jupyterlab>=4.0.0,<4.4",
-    "pypandoc>=1.10.0,<1.15",
+    "pypandoc>=1.10.0,<1.16",
 ]
 
 [tool.flit.module]
@@ -86,7 +87,11 @@ default_section = "THIRDPARTY"
 src_paths = ["doc", "src", "tests"]
 
 [tool.coverage.run]
-source = ["ansys.aedt"]
+source = ["ansys.aedt.toolkits.common"]
+omit = [
+    # Omit UI testing
+    "src/ansys/aedt/toolkits/common/ui/*",
+]
 
 [tool.coverage.report]
 show_missing = true