PyChOpMarg 0.1.3__tar.gz → 1.1.2__tar.gz

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/LICENSE

@@ -1,28 +1,28 @@
-BSD 3-Clause License
-
-Copyright (c) 2024, David Banas
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+BSD 3-Clause License
+
+Copyright (c) 2024, David Banas
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/PKG-INFO

@@ -1,39 +1,40 @@
-Metadata-Version: 2.1
-Name: PyChOpMarg
-Version: 0.1.3
-Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
-Author-email: David Banas <capn.freako@gmail.com>
-License: BSD3
-Project-URL: documentation, https://pychopmarg.readthedocs.io/en/latest/
-Keywords: com,channel,margin
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Telecommunications Industry
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Topic :: Adaptive Technologies
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: System :: Emulators
-Classifier: Topic :: System :: Networking
-Classifier: Topic :: Utilities
-Requires-Python: <3.12,>=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: chaco>=6.0.0
-Requires-Dist: click
-Requires-Dist: pyside6
-Requires-Dist: scikit-rf>=0.29
-Requires-Dist: traitsui>=8
-
-# PyChOpMarg
-Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Metadata-Version: 2.1
+Name: PyChOpMarg
+Version: 1.1.2
+Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Author-email: David Banas <capn.freako@gmail.com>
+License: BSD3
+Project-URL: documentation, https://pychopmarg.readthedocs.io/en/latest/
+Keywords: com,channel,margin
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Adaptive Technologies
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)
+Classifier: Topic :: Scientific/Engineering :: Visualization
+Classifier: Topic :: System :: Emulators
+Classifier: Topic :: System :: Networking
+Classifier: Topic :: Utilities
+Requires-Python: <3.12,>=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: chaco>=6.0.0
+Requires-Dist: click
+Requires-Dist: numpy<2
+Requires-Dist: pyside6
+Requires-Dist: scikit-rf>=0.29
+Requires-Dist: traitsui>=8
+
+# PyChOpMarg
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A.

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/README.md

@@ -1,2 +1,2 @@
-# PyChOpMarg
-Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+# PyChOpMarg
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A.

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/pyproject.toml

@@ -1,99 +1,100 @@
-[build-system]
-requires = [
-    "Cython<3",
-    "setuptools>=45",
-    "swig<4",
-]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "PyChOpMarg"
-description = "Python implementation of COM, as per IEEE 802.3-22 Annex 93A."
-version = "0.1.3"
-authors = [{name = "David Banas", email = "capn.freako@gmail.com"}]
-urls = { documentation = "https://pychopmarg.readthedocs.io/en/latest/"}
-readme = "README.md"
-requires-python = ">=3.9,<3.12"
-license = {text = "BSD3"}
-dependencies = [
-    "chaco>=6.0.0",
-    "click",
-    "pyside6",
-    "scikit-rf>=0.29",
-    "traitsui>=8",
-]
-keywords=["com", "channel", "margin"]
-classifiers=[
-    "Development Status :: 2 - Pre-Alpha",
-    "Environment :: Console",
-    "Intended Audience :: Developers",
-    "Intended Audience :: Education",
-    "Intended Audience :: Telecommunications Industry",
-    "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: BSD License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Topic :: Adaptive Technologies",
-    "Topic :: Scientific/Engineering",
-    "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
-    "Topic :: Scientific/Engineering :: Visualization",
-    "Topic :: System :: Emulators",
-    "Topic :: System :: Networking",
-    "Topic :: Utilities"
-]
-
-[project.scripts]
-pychopmarg = "pychopmarg.cli:cli"
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.black]
-line-length = 119
-
-[tool.isort]
-# profile = "black"
-known_first_party = ["pychopmarg"]
-known_third_party = ["numpy", "scipy", "scikit-rf"]
-
-[tool.docformatter]
-wrap-summaries = 0
-
-[tool.pytest.ini_options]
-minversion = "7.0"
-addopts = "-vv --durations=3"
-xfail_strict=true
-
-[tool.pylint.master]
-fail-under = 9.0
-
-[tool.pylint.messages_control]
-disable = [
-    "invalid-name",
-    "line-too-long",
-]
-
-[tool.pylint.format]
-max-line-length = 119
-
-[tool.pydocstyle]
-ignore = [
-    "D105", # Missing docstring in magic method
-    "D107", # Missing docstring in __init__
-]
-
-[[tool.mypy.overrides]]
-module = [
-    "scipy.*",
-    "skrf.*",
-    "chaco.*",
-    "enable.*",
-    "pyface.*",
-    "traits.*",
-    "traitsui.*"
-]
-ignore_missing_imports = true
+[build-system]
+requires = [
+    "Cython<3",
+    "setuptools>=45",
+    "swig<4",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "PyChOpMarg"
+description = "Python implementation of COM, as per IEEE 802.3-22 Annex 93A."
+version = "1.1.2"
+authors = [{name = "David Banas", email = "capn.freako@gmail.com"}]
+urls = { documentation = "https://pychopmarg.readthedocs.io/en/latest/"}
+readme = "README.md"
+requires-python = ">=3.9,<3.12"
+license = {text = "BSD3"}
+dependencies = [
+    "chaco>=6.0.0",
+    "click",
+    "numpy<2",
+    "pyside6",
+    "scikit-rf>=0.29",
+    "traitsui>=8",
+]
+keywords=["com", "channel", "margin"]
+classifiers=[
+    "Development Status :: 2 - Pre-Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Education",
+    "Intended Audience :: Telecommunications Industry",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Adaptive Technologies",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)",
+    "Topic :: Scientific/Engineering :: Visualization",
+    "Topic :: System :: Emulators",
+    "Topic :: System :: Networking",
+    "Topic :: Utilities"
+]
+
+[project.scripts]
+pychopmarg = "pychopmarg.cli:cli"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.black]
+line-length = 119
+
+[tool.isort]
+# profile = "black"
+known_first_party = ["pychopmarg"]
+known_third_party = ["numpy", "scipy", "scikit-rf"]
+
+[tool.docformatter]
+wrap-summaries = 0
+
+[tool.pytest.ini_options]
+minversion = "7.0"
+addopts = "-vv --durations=3"
+xfail_strict=true
+
+[tool.pylint.master]
+fail-under = 9.0
+
+[tool.pylint.messages_control]
+disable = [
+    "invalid-name",
+    "line-too-long",
+]
+
+[tool.pylint.format]
+max-line-length = 119
+
+[tool.pydocstyle]
+ignore = [
+    "D105", # Missing docstring in magic method
+    "D107", # Missing docstring in __init__
+]
+
+[[tool.mypy.overrides]]
+module = [
+    "scipy.*",
+    "skrf.*",
+    "chaco.*",
+    "enable.*",
+    "pyface.*",
+    "traits.*",
+    "traitsui.*"
+]
+ignore_missing_imports = true

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/src/PyChOpMarg.egg-info/PKG-INFO

@@ -1,39 +1,40 @@
-Metadata-Version: 2.1
-Name: PyChOpMarg
-Version: 0.1.3
-Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
-Author-email: David Banas <capn.freako@gmail.com>
-License: BSD3
-Project-URL: documentation, https://pychopmarg.readthedocs.io/en/latest/
-Keywords: com,channel,margin
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Telecommunications Industry
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Topic :: Adaptive Technologies
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: System :: Emulators
-Classifier: Topic :: System :: Networking
-Classifier: Topic :: Utilities
-Requires-Python: <3.12,>=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: chaco>=6.0.0
-Requires-Dist: click
-Requires-Dist: pyside6
-Requires-Dist: scikit-rf>=0.29
-Requires-Dist: traitsui>=8
-
-# PyChOpMarg
-Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Metadata-Version: 2.1
+Name: PyChOpMarg
+Version: 1.1.2
+Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Author-email: David Banas <capn.freako@gmail.com>
+License: BSD3
+Project-URL: documentation, https://pychopmarg.readthedocs.io/en/latest/
+Keywords: com,channel,margin
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Telecommunications Industry
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Adaptive Technologies
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA)
+Classifier: Topic :: Scientific/Engineering :: Visualization
+Classifier: Topic :: System :: Emulators
+Classifier: Topic :: System :: Networking
+Classifier: Topic :: Utilities
+Requires-Python: <3.12,>=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: chaco>=6.0.0
+Requires-Dist: click
+Requires-Dist: numpy<2
+Requires-Dist: pyside6
+Requires-Dist: scikit-rf>=0.29
+Requires-Dist: traitsui>=8
+
+# PyChOpMarg
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A.

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/src/PyChOpMarg.egg-info/requires.txt

@@ -1,5 +1,6 @@
 chaco>=6.0.0
 click
+numpy<2
 pyside6
 scikit-rf>=0.29
 traitsui>=8

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/src/pychopmarg/__init__.py

@@ -1,23 +1,23 @@
-"""
-A Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
-
-.. moduleauthor:: David Banas <capn.freako@gmail.com>
-
-Original Author: David Banas <capn.freako@gmail.com>
-
-Original Date:   29 February 2024
-
-Copyright (c) 2024 by David Banas; all rights reserved World wide.
-"""
-
-from importlib.metadata import version as _get_version
-
-# Set PEP396 version attribute
-try:
-    __version__ = _get_version("PyChOpMarg")
-except Exception:
-    __version__ = "(dev)"
-
-__date__ = "March 25, 2024"
-__authors__ = "David Banas"
-__copy__ = "Copyright (c) 2024 David Banas"
+"""
+A Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+
+.. moduleauthor:: David Banas <capn.freako@gmail.com>
+
+Original Author: David Banas <capn.freako@gmail.com>
+
+Original Date:   29 February 2024
+
+Copyright (c) 2024 by David Banas; all rights reserved World wide.
+"""
+
+from importlib.metadata import version as _get_version
+
+# Set PEP396 version attribute
+try:
+    __version__ = _get_version("PyChOpMarg")
+except Exception:
+    __version__ = "(dev)"
+
+__date__ = "March 25, 2024"
+__authors__ = "David Banas"
+__copy__ = "Copyright (c) 2024 David Banas"

{pychopmarg-0.1.3 → pychopmarg-1.1.2}/src/pychopmarg/cli.py

@@ -1,51 +1,51 @@
-"""
-Main Entry Point for PyChOpMarg when using the CLI.
-
-Original author: David Banas <capn.freako@gmail.com>
-
-Original date:   March 25, 2024
-
-Copyright (c) 2024 David Banas; all rights reserved World wide.
-"""
-
-from pathlib import Path
-
-import click  # type: ignore
-
-from pychopmarg import __version__
-from pychopmarg.view import traits_view
-from pychopmarg.com import COM
-
-
-@click.group(invoke_without_command=True, context_settings=dict(help_option_names=["-h", "--help"]))
-@click.pass_context
-@click.version_option(version=__version__)
-def cli(ctx):
-    """
-    PyChOpMarg GUI.
-    """
-
-    if ctx.invoked_subcommand is None:  # No sub-command like `sim` given open the GUI like default.
-        theCOM = COM()
-
-        # Show the GUI.
-        theCOM.configure_traits(view=traits_view)
-
-
-@cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
-@click.argument("config-file", type=click.Path(exists=True))
-@click.option("--results", "-r", type=click.Path(), help="Override the results filename.")
-def run(config_file, results):
-    """
-    Run a COM calculation without opening the GUI.
-
-    Will load the CONFIG_FILE from the given filepath, run the
-    COM calculation and then save the results into a file with the same name
-    but a different extension as the configuration file.
-    """
-    theCOM = COM()
-    theCOM.load_configuration(config_file)
-    theCOM.simulate(initial_run=True, update_plots=True)
-    if not results:
-        results = Path(config_file).with_suffix(".pychopmarg_results")
-    theCOM.save_results(results)
+"""
+Main Entry Point for PyChOpMarg when using the CLI.
+
+Original author: David Banas <capn.freako@gmail.com>
+
+Original date:   March 25, 2024
+
+Copyright (c) 2024 David Banas; all rights reserved World wide.
+"""
+
+from pathlib import Path
+
+import click  # type: ignore
+
+from pychopmarg import __version__
+from pychopmarg.view import traits_view
+from pychopmarg.com import COM
+
+
+@click.group(invoke_without_command=True, context_settings=dict(help_option_names=["-h", "--help"]))
+@click.pass_context
+@click.version_option(version=__version__)
+def cli(ctx):
+    """
+    PyChOpMarg GUI.
+    """
+
+    if ctx.invoked_subcommand is None:  # No sub-command like `sim` given open the GUI like default.
+        theCOM = COM()
+
+        # Show the GUI.
+        theCOM.configure_traits(view=traits_view)
+
+
+@cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
+@click.argument("config-file", type=click.Path(exists=True))
+@click.option("--results", "-r", type=click.Path(), help="Override the results filename.")
+def run(config_file, results):
+    """
+    Run a COM calculation without opening the GUI.
+
+    Will load the CONFIG_FILE from the given filepath, run the
+    COM calculation and then save the results into a file with the same name
+    but a different extension as the configuration file.
+    """
+    theCOM = COM()
+    theCOM.load_configuration(config_file)
+    theCOM.simulate(initial_run=True, update_plots=True)
+    if not results:
+        results = Path(config_file).with_suffix(".pychopmarg_results")
+    theCOM.save_results(results)