PyChOpMarg 1.1.3__tar.gz → 2.1.1__tar.gz

{pychopmarg-1.1.3 → pychopmarg-2.1.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyChOpMarg
-Version: 1.1.3
-Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Version: 2.1.1
+Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
 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: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -15,9 +15,10 @@ 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 :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Adaptive Technologies
 Classifier: Topic :: Scientific/Engineering
@@ -26,15 +27,16 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: System :: Emulators
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: Utilities
-Requires-Python: <3.12,>=3.9
+Requires-Python: <3.14,>=3.10
 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: numpy
 Requires-Dist: scikit-rf>=0.29
-Requires-Dist: traitsui>=8
+Requires-Dist: typing_extensions
 
 # PyChOpMarg
-Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
+
+- [Documentation](https://pychopmarg.readthedocs.io/en/latest/index.html)

pychopmarg-2.1.1/README.md

@@ -0,0 +1,5 @@
+# PyChOpMarg
+
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
+
+- [Documentation](https://pychopmarg.readthedocs.io/en/latest/index.html)

{pychopmarg-1.1.3 → pychopmarg-2.1.1}/pyproject.toml

@@ -1,31 +1,29 @@
 [build-system]
 requires = [
-    "Cython<3",
+    "Cython",
     "setuptools>=45",
-    "swig<4",
+    "swig",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyChOpMarg"
-description = "Python implementation of COM, as per IEEE 802.3-22 Annex 93A."
-version = "1.1.3"
+description = "Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A."
+version = "2.1.1"
 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"
+requires-python = ">=3.10,<3.14"
 license = {text = "BSD3"}
 dependencies = [
-    "chaco>=6.0.0",
     "click",
-    "numpy<2",
-    "pyside6",
+    "numpy",
     "scikit-rf>=0.29",
-    "traitsui>=8",
+    "typing_extensions",  # SciKit-RF requires this, but doesn't include it itself.
 ]
 keywords=["com", "channel", "margin"]
 classifiers=[
-    "Development Status :: 2 - Pre-Alpha",
+    "Development Status :: 3 - Alpha",
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Intended Audience :: Education",
@@ -34,9 +32,10 @@ classifiers=[
     "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 :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Adaptive Technologies",
     "Topic :: Scientific/Engineering",

{pychopmarg-1.1.3 → pychopmarg-2.1.1}/src/PyChOpMarg.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: PyChOpMarg
-Version: 1.1.3
-Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+Version: 2.1.1
+Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
 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: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -15,9 +15,10 @@ 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 :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Adaptive Technologies
 Classifier: Topic :: Scientific/Engineering
@@ -26,15 +27,16 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: System :: Emulators
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: Utilities
-Requires-Python: <3.12,>=3.9
+Requires-Python: <3.14,>=3.10
 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: numpy
 Requires-Dist: scikit-rf>=0.29
-Requires-Dist: traitsui>=8
+Requires-Dist: typing_extensions
 
 # PyChOpMarg
-Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+
+Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
+
+- [Documentation](https://pychopmarg.readthedocs.io/en/latest/index.html)

{pychopmarg-1.1.3 → pychopmarg-2.1.1}/src/PyChOpMarg.egg-info/SOURCES.txt

@@ -8,8 +8,14 @@ src/PyChOpMarg.egg-info/entry_points.txt
 src/PyChOpMarg.egg-info/requires.txt
 src/PyChOpMarg.egg-info/top_level.txt
 src/pychopmarg/__init__.py
+src/pychopmarg/__main__.py
 src/pychopmarg/cli.py
 src/pychopmarg/com.py
 src/pychopmarg/common.py
-src/pychopmarg/utility.py
-src/pychopmarg/view.py
+src/pychopmarg/noise.py
+src/pychopmarg/optimize.py
+src/pychopmarg/utility/__init__.py
+src/pychopmarg/utility/filter.py
+src/pychopmarg/utility/general.py
+src/pychopmarg/utility/probability.py
+src/pychopmarg/utility/sparams.py

pychopmarg-2.1.1/src/PyChOpMarg.egg-info/requires.txt

@@ -0,0 +1,4 @@
+click
+numpy
+scikit-rf>=0.29
+typing_extensions

{pychopmarg-1.1.3 → pychopmarg-2.1.1}/src/pychopmarg/__init__.py

@@ -1,5 +1,5 @@
 """
-A Python implementation of COM, as per IEEE 802.3-22 Annex 93A.
+A Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
 
 .. moduleauthor:: David Banas <capn.freako@gmail.com>
 
@@ -15,9 +15,9 @@ from importlib.metadata import version as _get_version
 # Set PEP396 version attribute
 try:
     __version__ = _get_version("PyChOpMarg")
-except Exception:
+except Exception:  # pylint: disable=broad-exception-caught
     __version__ = "(dev)"
 
-__date__ = "March 25, 2024"
+__date__ = "October 21, 2024"
 __authors__ = "David Banas"
 __copy__ = "Copyright (c) 2024 David Banas"

pychopmarg-2.1.1/src/pychopmarg/__main__.py

@@ -0,0 +1,13 @@
+"""
+Execute PyChOpMarg, according to command line arguments given.
+
+Original Author: David Banas <capn.freako@gmail.com>  
+Original Date:   27 August 2024
+
+Copyright (c) 2024 David Banas; all rights reserved World wide.
+"""
+
+# from pychopmarg.cli import cli
+# cli()
+print("Sorry, the PyChOpMarg package is currently only usable as a library.")
+print("It's GUI is currently broken.")

pychopmarg-2.1.1/src/pychopmarg/cli.py

@@ -0,0 +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.com import COM
+
+
+# ToDo: Activate when new `PyChOpMargUI` package is ready.
+# @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):
+#     """
+#     PyChOpMargUI 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)