PyChOpMarg 3.1.2__tar.gz → 3.3.0__tar.gz

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyChOpMarg
-Version: 3.1.2
+Version: 3.3.0
 Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
 Author-email: David Banas <capn.freako@gmail.com>
 License: BSD3
@@ -32,7 +32,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: numpy
+Requires-Dist: openpyxl
+Requires-Dist: pandas
 Requires-Dist: scikit-rf>=0.29
+Requires-Dist: xlrd
 Requires-Dist: typing_extensions
 Dynamic: license-file
 

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "PyChOpMarg"
 description = "Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A."
-version = "3.1.2"
+version = "3.3.0"
 authors = [{name = "David Banas", email = "capn.freako@gmail.com"}]
 urls = { documentation = "https://pychopmarg.readthedocs.io/en/latest/"}
 readme = "README.md"
@@ -18,7 +18,10 @@ license = {text = "BSD3"}
 dependencies = [
     "click",
     "numpy",
+    "openpyxl",  # COM configuration spreadsheets: *.xlsx
+    "pandas",
     "scikit-rf>=0.29",
+    "xlrd",      # COM configuration spreadsheets: *.xls
     "typing_extensions",  # SciKit-RF requires this, but doesn't include it itself.
 ]
 keywords=["com", "channel", "margin"]
@@ -52,6 +55,9 @@ pychopmarg = "pychopmarg.cli:cli"
 [tool.setuptools.packages.find]
 where = ["src"]
 
+[tool.setuptools.package-data]
+pychopmarg = ["mfiles/*.m"]  # MATLAB code run via the MATLAB Engine API (see `pychopmarg.matlab`).
+
 [tool.black]
 line-length = 119
 
@@ -86,9 +92,6 @@ ignore = [
     "D107", # Missing docstring in __init__
 ]
 
-[tool.mypy]
-plugins = "numpy.typing.mypy_plugin"
-
 [[tool.mypy.overrides]]
 module = [
     "scipy.*",
@@ -100,3 +103,25 @@ module = [
     "traitsui.*"
 ]
 ignore_missing_imports = true
+
+[dependency-groups]
+dev = [
+    "jupyter>=1.1.1",
+    "jupyterlab-execute-time>=3.3.0",
+    "m2r2>=0.3.4",
+    "matlabengine>=25,<26",
+    "matplotlib>=3.10.9",
+    "mcp>=2.0.0",
+    "mypy>=1.19.1",
+    "myst-parser>=4.0.0",
+    "pandas-stubs>=2.3.3.260113",
+    "pip>=25.3",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.0.0",
+    "pytest-xdist>=3.8.0",
+    "scipy-stubs>=1.15.3.0",
+    "sphinx>=8.1.3",
+    "sphinx-rtd-theme>=3.1.0",
+    "types-pyyaml>=6.0.12.20250915",
+    "typing-extensions>=4.15.0",
+]

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/src/PyChOpMarg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyChOpMarg
-Version: 3.1.2
+Version: 3.3.0
 Summary: Python implementation of COM, as per IEEE 802.3-22 Annex 93A/178A.
 Author-email: David Banas <capn.freako@gmail.com>
 License: BSD3
@@ -32,7 +32,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: numpy
+Requires-Dist: openpyxl
+Requires-Dist: pandas
 Requires-Dist: scikit-rf>=0.29
+Requires-Dist: xlrd
 Requires-Dist: typing_extensions
 Dynamic: license-file
 

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/src/PyChOpMarg.egg-info/SOURCES.txt

@@ -12,8 +12,10 @@ src/pychopmarg/__main__.py
 src/pychopmarg/cli.py
 src/pychopmarg/com.py
 src/pychopmarg/common.py
+src/pychopmarg/devmodel.py
 src/pychopmarg/excel.py
 src/pychopmarg/matlab.py
+src/pychopmarg/mlsd.py
 src/pychopmarg/noise.py
 src/pychopmarg/optimize.py
 src/pychopmarg/plot.py
@@ -21,10 +23,23 @@ src/pychopmarg/py.typed
 src/pychopmarg/config/__init__.py
 src/pychopmarg/config/ieee_8023by.py
 src/pychopmarg/config/ieee_8023dj.py
+src/pychopmarg/config/ieee_8023dj_d3p3.py
 src/pychopmarg/config/template.py
+src/pychopmarg/mfiles/pychopmarg_com.m
 src/pychopmarg/utility/__init__.py
 src/pychopmarg/utility/filter.py
 src/pychopmarg/utility/general.py
 src/pychopmarg/utility/jupyter.py
 src/pychopmarg/utility/probability.py
-src/pychopmarg/utility/sparams.py
+src/pychopmarg/utility/sparams.py
+tests/test_cli.py
+tests/test_com.py
+tests/test_devmodel.py
+tests/test_excel.py
+tests/test_filter.py
+tests/test_general.py
+tests/test_imports.py
+tests/test_matlab.py
+tests/test_mlsd.py
+tests/test_probability.py
+tests/test_template.py

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/src/PyChOpMarg.egg-info/requires.txt

@@ -1,4 +1,7 @@
 click
 numpy
+openpyxl
+pandas
 scikit-rf>=0.29
+xlrd
 typing_extensions

{pychopmarg-3.1.2 → pychopmarg-3.3.0}/src/pychopmarg/cli.py

@@ -20,7 +20,8 @@ from pychopmarg.utility.jupyter import execute_notebook, convert_notebook_to_htm
 
 # ToDo: Activate when new `PyChOpMargUI` package is ready.
 # @click.group(invoke_without_command=True, context_settings=dict(help_option_names=["-h", "--help"]))
-@click.group(invoke_without_command=False, context_settings=dict(help_option_names=["-h", "--help"]))
+# @click.group(invoke_without_command=False, context_settings=dict(help_option_names=["-h", "--help"]))
+@click.group(invoke_without_command=False, context_settings={"help_option_names": ["-h", "--help"]})
 @click.pass_context
 @click.version_option(version=__version__)
 def cli(ctx):
@@ -55,7 +56,8 @@ def cli(ctx):
 #     theCOM.save_results(results)
 
 
-@cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
+# @cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
+@cli.command(context_settings={"help_option_names": ["-h", "--help"]})
 @click.argument("notebook-file", type=click.Path(exists=True))
 def run_notebook(notebook_file: Path):
     """
@@ -63,7 +65,9 @@ def run_notebook(notebook_file: Path):
     """
     execute_notebook(notebook_file)
 
-@cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
+
+# @cli.command(context_settings=dict(help_option_names=["-h", "--help"]))
+@cli.command(context_settings={"help_option_names": ["-h", "--help"]})
 @click.argument("notebook-file", type=click.Path(exists=True))
 @click.option("--out-file", "-o", type=click.Path(), help="Override the output filename.")
 def convert_notebook(notebook_file: Path, out_file: Optional[Path] = None):
@@ -71,4 +75,3 @@ def convert_notebook(notebook_file: Path, out_file: Optional[Path] = None):
     Convert a Jupyter notebook to an HTML report, omitting all code.
     """
     convert_notebook_to_html(Path(notebook_file), results_path=out_file)
-