Merge branch 'main' into component_definitio

ansys · Dec 19, 2024 · 252ec40 · 252ec40
2 parents fb455eb + d28b8d3
commit 252ec40
Show file tree

Hide file tree

Showing 113 changed files with 72,249 additions and 214,593 deletions.
diff --git a/doc/source/Getting_started/ClientServer.rst b/doc/source/Getting_started/ClientServer.rst
@@ -14,7 +14,7 @@ In AEDT 2022 R2 and later, PyAEDT fully supports the gRPC API (except for EDB):
 
     # Launch the latest installed version of AEDT in graphical mode.
     from ansys.aedt.core import Hfss
-    from ansys.aedt.core import settings
+    from ansys.aedt.core.generic.settings import settings
     settings.use_grpc_api=True
     hfss = Hfss(machine="fullmachinename", port=portnumber)
 

diff --git a/doc/source/Getting_started/versioning.rst b/doc/source/Getting_started/versioning.rst
@@ -36,7 +36,7 @@ This interface works only on Windows and uses .NET COM objects.
 .. code:: python
 
 
-    from ansys.aedt.core import settings
+    from ansys.aedt.core.generic.settings import settings
 
     settings.use_grpc_api = False
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,8 @@ dependencies = [
     "tomli-w",
     "rpyc>=6.0.0,<6.1",
     "pyyaml",
-    "defusedxml>=0.7,<8.0"
+    "defusedxml>=0.7,<8.0",
+    "attrs!=24.3.0",
 ]
 
 [project.optional-dependencies]
@@ -55,7 +56,7 @@ unit-tests = [
 integration-tests = [
     "matplotlib>=3.5.0,<3.10",
     "mock>=5.1.0,<5.2",
-    "numpy>=1.20.0,<2",
+    "numpy>=1.20.0,<2.3",
     "pandas>=1.1.0,<2.3",
     "pytest>=7.4.0,<8.4",
     "pytest-cov>=4.0.0,<6.1",
@@ -65,7 +66,7 @@ tests = [
     "joblib>=1.0.0,<1.5",
     "matplotlib>=3.5.0,<3.10",
     "mock>=5.1.0,<5.2",
-    "numpy>=1.20.0,<2",
+    "numpy>=1.20.0,<2.3",
     "openpyxl>=3.1.0,<3.3",
     "osmnx>=1.1.0,<2.1",
     "pandas>=1.1.0,<2.3",
@@ -76,7 +77,7 @@ tests = [
     "ansys-tools-visualization-interface; python_version >= '3.10'",
     "tables; python_version >= '3.10'",
     # Never directly imported but required when loading ML related file see #4713
-    "scikit-learn>=1.0.0,<1.6",
+    "scikit-learn>=1.0.0,<1.7",
     "scikit-rf>=0.30.0,<1.6",
     "SRTM.py",
     "utm",
@@ -104,7 +105,7 @@ doc = [
 ]
 all = [
     "matplotlib>=3.5.0,<3.10",
-    "numpy>=1.20.0,<2",
+    "numpy>=1.20.0,<2.3",
     "openpyxl>=3.1.0,<3.3",
     "osmnx>=1.1.0,<2.1",
     "pandas>=1.1.0,<2.3",
@@ -113,22 +114,22 @@ all = [
     "ansys-tools-visualization-interface; python_version >= '3.10'",
     "tables; python_version >= '3.10'",
     # Never directly imported but required when loading ML related file see #4713
-    "scikit-learn>=1.0.0,<1.6",
+    "scikit-learn>=1.0.0,<1.7",
     "scikit-rf>=0.30.0,<1.6",
     "SRTM.py",
     "utm",
 ]
 installer = [
     "matplotlib>=3.5.0,<3.10",
-    "numpy>=1.20.0,<2",
+    "numpy>=1.20.0,<2.3",
     "openpyxl>=3.1.0,<3.3",
     "osmnx>=1.1.0,<2.1",
     "pandas>=1.1.0,<2.3",
     "pyvista[io]>=0.38.0,<0.45",
     "fast-simplification>=0.1.7",
     "ansys-tools-visualization-interface; python_version >= '3.10'",
     # Never directly imported but required when loading ML related file see #4713
-    "scikit-learn>=1.0.0,<1.6",
+    "scikit-learn>=1.0.0,<1.7",
     "scikit-rf>=0.30.0,<1.6",
     "SRTM.py",
     "utm",

diff --git a/src/ansys/aedt/core/__init__.py b/src/ansys/aedt/core/__init__.py
@@ -53,7 +53,7 @@ def deprecation_warning():
 
     # Define and use custom showwarning
     def custom_show_warning(message, category, filename, lineno, file=None, line=None):
-        """Custom warning used to remove <stdin>:loc: pattern."""
+        """Define and use custom warning to remove <stdin>:loc: pattern."""
         print(f"{category.__name__}: {message}")
 
     warnings.showwarning = custom_show_warning

diff --git a/src/ansys/aedt/core/application/aedt_objects.py b/src/ansys/aedt/core/application/aedt_objects.py
@@ -88,7 +88,6 @@ def oradfield(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("RadField")
         """
         if self.design_type == "HFSS" and self._odesign.GetSolutionType() not in ["EigenMode", "Characteristic Mode"]:
@@ -111,7 +110,6 @@ def o_symbol_manager(self):
 
         References
         ----------
-
         >>> oSymbolManager = oDefinitionManager.GetManager("Symbol")
         """
         if self.odefinition_manager:
@@ -124,7 +122,6 @@ def opadstackmanager(self):
 
         References
         ----------
-
         >>> oPadstackManger = oDefinitionManager.GetManager("Padstack")
         """
         if self._oproject and not self._opadstackmanager:
@@ -153,7 +150,6 @@ def oimport_export(self):
 
         References
         ----------
-
         >>> oDesktop.GetTool("ImportExport")
         """
         if not self._oimport_export:
@@ -166,7 +162,6 @@ def ooptimetrics(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("Optimetrics")
         """
         if not self._ooptimetrics and self.design_type not in ["Circuit Netlist", "Maxwell Circuit", "EMIT"]:
@@ -179,7 +174,6 @@ def ooutput_variable(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("OutputVariable")
         """
         if not self._ooutput_variable and self.design_type not in ["EMIT", "Maxwell Circuit", "Circuit Netlist"]:
@@ -192,7 +186,6 @@ def oanalysis(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("SolveSetups")
         >>> oDesign.GetModule("SimSetup")
         >>> oDesign.GetModule("AnalysisSetup")
@@ -215,7 +208,6 @@ def odefinition_manager(self):
 
         References
         ----------
-
         >>> oDefinitionManager = oProject.GetDefinitionManager()
         """
         if not self._odefinition_manager and self._oproject:
@@ -228,7 +220,6 @@ def omaterial_manager(self):
 
         References
         ----------
-
         >>> oMaterialManager = oDefinitionManager.GetManager("Material")
         """
         if self.odefinition_manager and not self._omaterial_manager:
@@ -241,7 +232,6 @@ def omodelsetup(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("ModelSetup")
         """
         if self.design_type not in ["Maxwell 3D", "Maxwell 2D", "HFSS"]:
@@ -261,7 +251,6 @@ def o_maxwell_parameters(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("MaxwellParameterSetup")
         """
         if self._odesign and self.design_type not in ["Maxwell 3D", "Maxwell 2D"]:
@@ -285,7 +274,6 @@ def osolution(self):
 
         References
         ----------
-
         >>> oModule = oDesign.GetModule("Solutions")
         """
         if not self._osolution:
@@ -310,7 +298,6 @@ def oexcitation(self):
 
         References
         ----------
-
         >>> oModule = oDesign.GetModule("Excitations")
         """
         if self.design_type not in ["HFSS3DLayout", "HFSS 3D Layout Design"]:
@@ -339,7 +326,6 @@ def ofieldsreporter(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("FieldsReporter")
         """
         if self.design_type in [
@@ -366,7 +352,6 @@ def oreportsetup(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("ReportSetup")
         """
         if not self._oreportsetup:
@@ -379,7 +364,6 @@ def omeshmodule(self):
 
         References
         ----------
-
         >>> oDesign.GetModule("MeshRegion")
         """
         meshers = {
@@ -403,7 +387,6 @@ def oeditor(self):
 
         References
         ----------
-
         >>> oEditor = oDesign.SetActiveEditor("SchematicEditor")"""
         if not self._oeditor and self._odesign:
             if self.design_type in ["Circuit Design", "Twin Builder", "Maxwell Circuit", "EMIT"]:
@@ -427,7 +410,6 @@ def layouteditor(self):
 
         References
         ----------
-
         >>> oDesign.SetActiveEditor("Layout")
         """
         if not self._layouteditor and self.design_type in ["Circuit Design"]: