pyedb 0.19.0__py3-none-any.whl → 0.21.0__py3-none-any.whl

pyedb/dotnet/edb_core/net_class.py

@@ -41,7 +41,6 @@ class EdbCommon:
 
         Returns
         -------
-        :class:` :class:`pyedb.dotnet.edb_core.dotnet.layout.LayoutDotNet`
         """
         return self._pedb.layout
 
@@ -90,10 +89,10 @@ class EdbNetClasses(EdbCommon, object):
         dict[str, :class:`pyedb.dotnet.edb_core.edb_data.nets_data.EDBDifferentialPairData`]
             Dictionary of extended nets.
         """
-        net_classes = {}
-        for net_class in self._layout.net_classes:
-            net_classes[net_class.GetName()] = EDBNetClassData(self._pedb, net_class)
-        return net_classes
+        temp = {}
+        for i in self._layout.net_classes:
+            temp[i.name] = i
+        return temp
 
     def create(self, name, net):
         # type: (str, str|list)->EDBNetClassData
@@ -147,8 +146,8 @@ class EdbExtendedNets(EdbCommon, object):
             Dictionary of extended nets.
         """
         nets = {}
-        for extended_net in self._layout.extended_nets:
-            nets[extended_net.GetName()] = EDBExtendedNetData(self._pedb, extended_net)
+        for extended_net in self._pedb.layout.extended_nets:
+            nets[extended_net.name] = extended_net
         return nets
 
     def create(self, name, net):
@@ -273,7 +272,7 @@ class EdbDifferentialPairs(EdbCommon, object):
         """
         diff_pairs = {}
         for diff_pair in self._layout.differential_pairs:
-            diff_pairs[diff_pair.GetName()] = EDBDifferentialPairData(self._pedb, diff_pair)
+            diff_pairs[diff_pair.name] = diff_pair
         return diff_pairs
 
     def create(self, name, net_p, net_n):

pyedb/dotnet/edb_core/nets.py

@@ -29,7 +29,7 @@ import warnings
 
 from pyedb.dotnet.edb_core.edb_data.nets_data import EDBNetsData
 from pyedb.generic.constants import CSS4_COLORS
-from pyedb.generic.general_methods import generate_unique_name, is_ironpython
+from pyedb.generic.general_methods import generate_unique_name
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -55,10 +55,7 @@ class EdbNets(object):
         :class:` :class:`pyedb.dotnet.edb_core.edb_data.nets_data.EDBNetsData`
 
         """
-        if name in self.nets:
-            return self.nets[name]
-        self._pedb.logger.error("Component or definition not found.")
-        return
+        return self._pedb.layout.find_net_by_name(name)
 
     def __contains__(self, name):
         """Determine if a net is named ``name`` or not.
@@ -119,7 +116,7 @@ class EdbNets(object):
         dict[str, :class:`pyedb.dotnet.edb_core.edb_data.nets_data.EDBNetsData`]
             Dictionary of nets.
         """
-        return self._pedb.modeler.nets
+        return {i.name: i for i in self._pedb.layout.nets}
 
     @property
     def netlist(self):
@@ -841,9 +838,6 @@ class EdbNets(object):
         show : bool, optional
             Whether to show the plot or not. Default is `True`.
         """
-        if is_ironpython:
-            self._logger.warning("Plot functionalities are enabled only in CPython.")
-            return False
         from pyedb.generic.plot import plot_matplotlib
 
         object_lists = self.get_plot_data(

pyedb/dotnet/edb_core/padstack.py

@@ -61,8 +61,8 @@ class EdbPadstacks(object):
         :class:`pyedb.dotnet.edb_core.cell.hierarchy.component.EDBComponent`
 
         """
-        if name in self.instances:
-            return self.instances[name]
+        if isinstance(name, int) and name in self.instances:
+            return self._pedb.layout.find_object_by_id(name)
         elif name in self.definitions:
             return self.definitions[name]
         else:
@@ -74,6 +74,8 @@ class EdbPadstacks(object):
 
     def __init__(self, p_edb):
         self._pedb = p_edb
+        self._instances = {}
+        self._definitions = {}
 
     @property
     def _edb(self):
@@ -183,12 +185,14 @@ class EdbPadstacks(object):
             List of definitions via padstack definitions.
 
         """
-        _padstacks = {}
+        if len(self._definitions) == len(self._pedb.padstack_defs):
+            return self._definitions
+        self._definitions = {}
         for padstackdef in self._pedb.padstack_defs:
             PadStackData = padstackdef.GetData()
             if len(PadStackData.GetLayerNames()) >= 1:
-                _padstacks[padstackdef.GetName()] = EDBPadstack(padstackdef, self)
-        return _padstacks
+                self._definitions[padstackdef.GetName()] = EDBPadstack(padstackdef, self)
+        return self._definitions
 
     @property
     def padstacks(self):
@@ -217,11 +221,11 @@ class EdbPadstacks(object):
 
         """
 
-        padstack_instances = {}
         edb_padstack_inst_list = self._pedb.layout.padstack_instances
-        for edb_padstack_instance in edb_padstack_inst_list:
-            padstack_instances[edb_padstack_instance.GetId()] = EDBPadstackInstance(edb_padstack_instance, self._pedb)
-        return padstack_instances
+        if len(self._instances) == len(edb_padstack_inst_list):
+            return self._instances
+        self._instances = {i.id: i for i in edb_padstack_inst_list}
+        return self._instances
 
     @property
     def instances_by_name(self):

pyedb/dotnet/edb_core/sim_setup_data/data/sweep_data.py

@@ -50,7 +50,10 @@ class SweepData(object):
     def _update_sweep(self):
         """Update the sweep."""
         self.sim_setup.delete_frequency_sweep(self)
-        self.sim_setup._add_frequency_sweep(self)
+        ss_info = self.sim_setup.sim_setup_info
+        ss_info.add_sweep_data(self)
+        self.sim_setup.set_sim_setup_info(ss_info)
+        self.sim_setup._update_setup()
         return
 
     @property
@@ -165,7 +168,7 @@ class SweepData(object):
             self._edb_object.FreqSweepType = edb_freq_sweep_type.kBroadbandFastSweep
         elif value in [3, "kNumSweepTypes"]:
             self._edb_object.FreqSweepType = edb_freq_sweep_type.kNumSweepTypes
-        self._edb_object.FreqSweepType.ToString()
+        self._update_sweep()
 
     @property
     def type(self):

pyedb/dotnet/edb_core/siwave.py

@@ -36,7 +36,6 @@ from pyedb.dotnet.edb_core.edb_data.sources import (
     CircuitPort,
     CurrentSource,
     DCTerminal,
-    PinGroup,
     ResistorSource,
     VoltageSource,
 )
@@ -129,8 +128,8 @@ class EdbSiwave(object):
             List of all layout pin groups.
         """
         _pingroups = {}
-        for el in self._layout.pin_groups:
-            _pingroups[el.GetName()] = PinGroup(el.GetName(), el, self._pedb)
+        for el in self._pedb.layout.pin_groups:
+            _pingroups[el._edb_object.GetName()] = el
         return _pingroups
 
     def _create_terminal_on_pins(self, source):
@@ -325,10 +324,10 @@ class EdbSiwave(object):
                 pin = [
                     pin
                     for pin in self._pedb.padstacks.get_pinlist_from_component_and_net(component_name)
-                    if pin.GetName() == pin_name
+                    if pin.component_pin == pin_name
                 ][0]
-                term_name = "{}_{}_{}".format(pin.GetComponent().GetName(), pin.GetNet().GetName(), pin.GetName())
-                res, start_layer, stop_layer = pin.GetLayerRange()
+                term_name = "{}_{}_{}".format(pin.component.name, pin._edb_object.GetNet().GetName(), pin.component_pin)
+                res, start_layer, stop_layer = pin._edb_object.GetLayerRange()
                 if res:
                     pin_instance = pin._edb_padstackinstance
                     positive_terminal = self._edb.cell.terminal.PadstackInstanceTerminal.Create(

pyedb/dotnet/edb_core/stackup.py

@@ -38,27 +38,26 @@ from pyedb.dotnet.edb_core.edb_data.layer_data import (
     StackupLayerEdbClass,
 )
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
-from pyedb.generic.general_methods import ET, generate_unique_name, is_ironpython
+from pyedb.generic.general_methods import ET, generate_unique_name
 from pyedb.misc.aedtlib_personalib_install import write_pretty_xml
 
 colors = None
 pd = None
 np = None
-if not is_ironpython:
-    try:
-        import matplotlib.colors as colors
-    except ImportError:
-        colors = None
-
-    try:
-        import numpy as np
-    except ImportError:
-        np = None
-
-    try:
-        import pandas as pd
-    except ImportError:
-        pd = None
+try:
+    import matplotlib.colors as colors
+except ImportError:
+    colors = None
+
+try:
+    import numpy as np
+except ImportError:
+    np = None
+
+try:
+    import pandas as pd
+except ImportError:
+    pd = None
 
 logger = logging.getLogger(__name__)
 
@@ -970,8 +969,7 @@ class Stackup(LayerCollection):
         if not pd:
             self._pedb.logger.error("Pandas is needed. Please, install it first.")
             return False
-        if is_ironpython:
-            return
+
         data = {
             "Type": [],
             "Material": [],
@@ -1972,9 +1970,7 @@ class Stackup(LayerCollection):
         if not pd:
             self._pedb.logger.error("Pandas is needed. You must install it first.")
             return False
-        if is_ironpython:
-            self._pedb.logger.error("Method works on CPython only.")
-            return False
+
         df = pd.read_csv(file_path, index_col=0)
 
         for name in self.stackup_layers.keys():  # pragma: no cover
@@ -2451,8 +2447,7 @@ class Stackup(LayerCollection):
         -------
         :class:`matplotlib.plt`
         """
-        if is_ironpython:
-            return False
+
         from pyedb.generic.constants import CSS4_COLORS
         from pyedb.generic.plot import plot_matplotlib
 

pyedb/dotnet/edb_core/utilities/simulation_setup.py

@@ -293,10 +293,7 @@ class SimulationSetup(object):
         """
         warnings.warn("Use new property :func:`add_sweep_data` instead.", DeprecationWarning)
         self._sweep_list[sweep_data.name] = sweep_data
-        if self.setup_type in ["kRaptorX", "kHFSSPI"]:
-            edb_setup_info = self._edb_setup_info
-        else:
-            edb_setup_info = self.sim_setup_info
+        edb_setup_info = self.sim_setup_info
 
         if self._setup_type in ["kSIwave", "kHFSS", "kRaptorX", "kHFSSPI"]:
             for _, v in self._sweep_list.items():

pyedb/generic/filesystem.py

@@ -16,16 +16,10 @@ def search_files(dirname, pattern="*"):
     -------
     list
     """
-    from pyedb.generic.general_methods import is_ironpython
 
-    if is_ironpython:
-        import glob
+    import pathlib
 
-        return list(glob.glob(os.path.join(dirname, pattern)))
-    else:
-        import pathlib
-
-        return [os.path.abspath(i) for i in pathlib.Path(dirname).glob(pattern)]
+    return [os.path.abspath(i) for i in pathlib.Path(dirname).glob(pattern)]
 
 
 def my_location():

pyedb/generic/general_methods.py

@@ -47,11 +47,9 @@ from pyedb.exceptions import MaterialModelException
 from pyedb.generic.constants import CSS4_COLORS
 from pyedb.generic.settings import settings
 
-is_ironpython = "IronPython" in sys.version or ".NETFramework" in sys.version
 is_linux = os.name == "posix"
 is_windows = not is_linux
 _pythonver = sys.version_info[0]
-inside_desktop = True if is_ironpython and "4.0.30319.42000" in sys.version else False
 
 
 try:
@@ -868,10 +866,7 @@ def read_xlsx(filename):  # pragma: no cover
 
 
 def write_csv(output, list_data, delimiter=",", quotechar="|", quoting=csv.QUOTE_MINIMAL):  # pragma: no cover
-    if is_ironpython:
-        f = open(output, "wb")
-    else:
-        f = open(output, "w", newline="")
+    f = open(output, "w", newline="")
     writer = csv.writer(f, delimiter=delimiter, quotechar=quotechar, quoting=quoting)
     for data in list_data:
         writer.writerow(data)
@@ -1302,10 +1297,9 @@ def install_with_pip(package_name, package_path=None, upgrade=False, uninstall=F
     uninstall : bool, optional
         Whether to install the package or uninstall the package.
     """
-    if is_linux and is_ironpython:
-        import subprocessdotnet as subprocess
-    else:
-        import subprocess
+
+    import subprocess
+
     executable = '"{}"'.format(sys.executable) if is_windows else sys.executable
 
     commands = []

pyedb/generic/plot.py

@@ -2,35 +2,32 @@ import ast
 import os
 import warnings
 
-from pyedb.generic.general_methods import is_ironpython
-
-if not is_ironpython:  # pragma: no cover
-    try:
-        import numpy  # noqa: F401
-    except ImportError:
-        warnings.warn(
-            "The NumPy module is required to run some functionalities of PostProcess.\n"
-            "Install with \n\npip install numpy\n\nRequires CPython."
-        )
-
-    try:
-        from matplotlib.patches import PathPatch
-        from matplotlib.path import Path
-
-        # Use matplotlib agg backend (non-interactive) when the CI is running.
-        if bool(int(os.getenv("PYEDB_CI_NO_DISPLAY", "0"))):  # pragma: no cover
-            import matplotlib
-
-            matplotlib.use("Agg")
-        import matplotlib.pyplot as plt
-
-    except ImportError:
-        warnings.warn(
-            "The Matplotlib module is required to run some functionalities of PostProcess.\n"
-            "Install with \n\npip install matplotlib\n\nRequires CPython."
-        )
-    except:
-        pass
+try:
+    import numpy  # noqa: F401
+except ImportError:
+    warnings.warn(
+        "The NumPy module is required to run some functionalities of PostProcess.\n"
+        "Install with \n\npip install numpy\n\nRequires CPython."
+    )
+
+try:
+    from matplotlib.patches import PathPatch
+    from matplotlib.path import Path
+
+    # Use matplotlib agg backend (non-interactive) when the CI is running.
+    if bool(int(os.getenv("PYEDB_CI_NO_DISPLAY", "0"))):  # pragma: no cover
+        import matplotlib
+
+        matplotlib.use("Agg")
+    import matplotlib.pyplot as plt
+
+except ImportError:
+    warnings.warn(
+        "The Matplotlib module is required to run some functionalities of PostProcess.\n"
+        "Install with \n\npip install matplotlib\n\nRequires CPython."
+    )
+except:
+    pass
 
 
 def plot_matplotlib(

pyedb/generic/process.py

@@ -1,11 +1,7 @@
 import os.path
+import subprocess
 
-from pyedb.generic.general_methods import env_path, is_ironpython, is_linux
-
-if is_linux and is_ironpython:
-    import subprocessdotnet as subprocess
-else:
-    import subprocess
+from pyedb.generic.general_methods import env_path, is_linux
 
 
 class SiwaveSolve(object):

pyedb/misc/downloads.py

@@ -24,15 +24,10 @@
 import os
 import shutil
 import tempfile
+import urllib.request
 import zipfile
 
-from pyedb.generic.general_methods import is_ironpython, is_linux, settings
-from pyedb.misc.misc import list_installed_ansysem
-
-if is_ironpython:
-    import urllib
-else:
-    import urllib.request
+from pyedb.generic.general_methods import is_linux, settings
 
 tmpfold = tempfile.gettempdir()
 EXAMPLE_REPO = "https://github.com/ansys/example-data/raw/master/"
@@ -62,8 +57,7 @@ def _retrieve_file(url, filename, directory, destination=None, local_paths=[]):
         local_paths.append(local_path_no_zip)
 
     # grab the correct url retriever
-    if not is_ironpython:
-        urlretrieve = urllib.request.urlretrieve
+    urlretrieve = urllib.request.urlretrieve
     destination_dir = os.path.join(destination, directory)
     if not os.path.isdir(destination_dir):
         os.makedirs(destination_dir)
@@ -71,35 +65,6 @@ def _retrieve_file(url, filename, directory, destination=None, local_paths=[]):
     if is_linux:
         command = "wget {} -O {}".format(url, local_path)
         os.system(command)
-    elif is_ironpython:
-        versions = list_installed_ansysem()
-        if versions:
-            cpython = os.listdir(os.path.join(os.getenv(versions[0]), "commonfiles", "CPython"))
-            command = (
-                '"'
-                + os.path.join(
-                    os.getenv(versions[0]),
-                    "commonfiles",
-                    "CPython",
-                    cpython[0],
-                    "winx64",
-                    "Release",
-                    "python",
-                    "python.exe",
-                )
-                + '"'
-            )
-            commandargs = os.path.join(os.path.dirname(local_path), "download.py")
-            command += ' "' + commandargs + '"'
-            with open(os.path.join(os.path.dirname(local_path), "download.py"), "w") as f:
-                f.write("import urllib.request\n")
-                f.write("urlretrieve = urllib.request.urlretrieve\n")
-                f.write("import urllib.request\n")
-                f.write('url = r"{}"\n'.format(url))
-                f.write('local_path = r"{}"\n'.format(local_path))
-                f.write("urlretrieve(url, local_path)\n")
-            print(command)
-            os.system(command)
     else:
         _, resp = urlretrieve(url, local_path)
     local_paths.append(local_path)
@@ -118,8 +83,6 @@ def _retrieve_folder(url, directory, destination=None, local_paths=[]):  # pragm
     else:
         local_path = os.path.join(destination, directory)
 
-    if is_ironpython:
-        return False
     _get_dir = _get_file_url(directory)
     with urllib.request.urlopen(_get_dir) as response:  # nosec
         data = response.read().decode("utf-8").split("\n")

pyedb/siwave.py

@@ -16,7 +16,7 @@ import warnings
 
 from pyedb.dotnet.clr_module import _clr
 from pyedb.edb_logger import pyedb_logger
-from pyedb.generic.general_methods import _pythonver, is_ironpython, is_windows
+from pyedb.generic.general_methods import _pythonver, is_windows
 from pyedb.misc.misc import list_installed_ansysem
 from pyedb.siwave_core.icepak import Icepak
 
@@ -80,10 +80,7 @@ class Siwave(object):  # pragma no cover
 
     def __init__(self, specified_version=None):
         self._logger = pyedb_logger
-        if is_ironpython:
-            _com = "pythonnet"
-            import System
-        elif is_windows:  # pragma: no cover
+        if is_windows:  # pragma: no cover
             modules = [tup[1] for tup in pkgutil.iter_modules()]
             if _clr:
                 import win32com.client

{pyedb-0.19.0.dist-info → pyedb-0.21.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.19.0
+Version: 0.21.0
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>
@@ -31,7 +31,7 @@ Requires-Dist: jupyterlab>=4.0.0,<4.3 ; extra == "doc"
 Requires-Dist: jupytext>=1.16.0,<1.17 ; extra == "doc"
 Requires-Dist: matplotlib>=3.5.0,<3.10 ; extra == "doc"
 Requires-Dist: nbsphinx>=0.9.0,<0.10 ; extra == "doc"
-Requires-Dist: nbconvert < 7.14 ; extra == "doc"
+Requires-Dist: nbconvert < 7.17 ; extra == "doc"
 Requires-Dist: numpydoc>=1.5.0,<1.8 ; extra == "doc"
 Requires-Dist: pypandoc>=1.10.0,<1.14 ; extra == "doc"
 Requires-Dist: recommonmark ; extra == "doc"