egauge-python 0.9.1__tar.gz → 0.9.2__tar.gz

{egauge-python-0.9.1 → egauge-python-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.9.1
+Version: 0.9.2
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Provides-Extra: examples
+Provides-Extra: pyside
 License-File: LICENSE
 
 # eGauge open source Python code
@@ -27,6 +28,15 @@ Please see LICENSE for details.  eGauge Systems LLC reserves the
 rights to add, modify, or remove code from this repository or the
 entire repository without notice.
 
+## egauge.pyside.terminal Support
+
+To use module `egauge.pyside.terminal`, be sure to install the package
+with the `pyside` extra dependencies:
+
+```sh
+pip install egauge-python[pyside]
+```
+
 ## Example Programs
 
 Example programs can be found in the `egauge.examples` module.  If you

{egauge-python-0.9.1 → egauge-python-0.9.2}/README.md

@@ -7,6 +7,15 @@ Please see LICENSE for details.  eGauge Systems LLC reserves the
 rights to add, modify, or remove code from this repository or the
 entire repository without notice.
 
+## egauge.pyside.terminal Support
+
+To use module `egauge.pyside.terminal`, be sure to install the package
+with the `pyside` extra dependencies:
+
+```sh
+pip install egauge-python[pyside]
+```
+
 ## Example Programs
 
 Example programs can be found in the `egauge.examples` module.  If you

egauge-python-0.9.2/egauge/ctid/__init__.py

@@ -0,0 +1,7 @@
+from .bit_stuffer import *  # NOQA
+from .ctid import *  # NOQA
+from .waveform import *  # NOQA
+from .intel_hex_encoder import (
+    intel_hex_encode as intel_hex_encode,
+    CTID_TABLE_ADDR as CTID_TABLE_ADDR,
+)

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge/ctid/ctid.py

@@ -406,35 +406,35 @@ class Table:
         self.version = CTID_VERSION
         self.mfg_id = 0
         self.model = ""
-        self.serial_number = 0
+        self.serial_number: int = 0
         self.sensor_type = SENSOR_TYPE_AC
-        self.r_source = 0
-        self.r_load = 0  # undefined
-
-        self.size = 0
-        self.rated_current = 0
-        self.voltage_at_rated_current = 0
-        self.phase_at_rated_current = 0
-        self.voltage_temp_coeff = 0
-        self.phase_temp_coeff = 0
+        self.r_source: float = 0
+        self.r_load: float = 0  # undefined
+
+        self.size: float = 0
+        self.rated_current: float = 0
+        self.voltage_at_rated_current: float = 0
+        self.phase_at_rated_current: float = 0
+        self.voltage_temp_coeff: float = 0
+        self.phase_temp_coeff: float = 0
         self.cal_table = {1.5: [0, 0], 5: [0, 0], 15: [0, 0], 50: [0, 0]}
-        self.bias_voltage = 0
+        self.bias_voltage: float = 0
         self.reserved = 0
         self.mfg_info = 0
-        self.scale = 0
-        self.offset = 0
-        self.delay = 0
-        self.sensor_unit = 0
-        self.threshold = 0
-        self.hysteresis = 0
-        self.debounce_time = 0
-        self.edge_mask = 0
-        self.ntc_a = 0
-        self.ntc_b = 0
-        self.ntc_c = 0
-        self.ntc_m = 0
-        self.ntc_n = 0
-        self.ntc_k = 0
+        self.scale: float = 0
+        self.offset: float = 0
+        self.delay: float = 0
+        self.sensor_unit: int = 0
+        self.threshold: float = 0
+        self.hysteresis: float = 0
+        self.debounce_time: int = 0
+        self.edge_mask: int = 0
+        self.ntc_a: float = 0
+        self.ntc_b: float = 0
+        self.ntc_c: float = 0
+        self.ntc_m: float = 0
+        self.ntc_n: float = 0
+        self.ntc_k: float = 0
 
         # internal data:
         self._raw_data = b""

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge/examples/test_register.py

@@ -15,12 +15,6 @@ Second, it calculates how much the registers have changed since the
 start of the month and outputs the change both as the accrued value
 and the average value since the beginning of the month.
 
-Install egauge-python with a command of the form:
-
-        pip install egauge-python[examples]
-
-to ensure that pytz is installed on your system.
-
 You can set environment variables:
 
         EGDEV - the URL of the meter to use (e.g., http://eGaugeXXX.local)
@@ -33,9 +27,7 @@ Alternatively, you can edit examples/test_common.py to suit your needs.
 
 import argparse
 import sys
-from datetime import datetime
-
-import pytz
+from datetime import datetime, timezone
 
 from egauge.examples import test_common
 from egauge.webapi.device import PhysicalQuantity, Register, UnitSystem
@@ -70,9 +62,9 @@ if ts is None:
     sys.exit(1)
 
 # Print the current time of the meter in human-readable form:
-dt = datetime.fromtimestamp(round(ts), tz=pytz.utc)
-time_str = dt.strftime("%Y-%m-%d %H:%M:%S")
-print(f"\nRegister rates as of {time_str} (meter time):")
+dt = datetime.fromtimestamp(round(ts), tz=timezone.utc)
+time_str = dt.strftime("%Y-%m-%d %H:%M:%S %Z")
+print(f"\nRegister rates as of {time_str} (time on the meter):")
 
 # Output the register rates, nicely formatted:
 for regname in ret.regs:
@@ -90,9 +82,9 @@ for regname in ret.regs:
 # data rows (now and the start of the month):
 delta = ret[0] - ret[1]
 
-dt = datetime.fromtimestamp(round(ret[1].ts), tz=pytz.utc)
-time_str = dt.strftime("%Y-%m-%d %H:%M:%S")
-print(f"\nRegister change since {time_str} (start of month in meter time):")
+dt = datetime.fromtimestamp(round(ret[1].ts), tz=timezone.utc)
+time_str = dt.strftime("%Y-%m-%d %H:%M:%S %Z")
+print(f"\nRegister change since {time_str} (start of month on the meter):")
 print(34 * " " + f"{'Accumulated':18s}" + 14 * " " + "Average")
 
 # Output the changes since the start of the month:

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge/webapi/device/ctid_info.py

@@ -34,6 +34,7 @@ import datetime
 import os
 import secrets
 import time
+from collections.abc import Sequence
 
 from egauge import ctid, webapi
 
@@ -480,7 +481,7 @@ class CTidInfo:
             port_number, reply.get("polarity"), ctid_info_to_table(reply)
         )
 
-    def put(self, port_info: PortInfo | list[PortInfo]):
+    def put(self, port_info: PortInfo | Sequence[PortInfo]):
         """Store CTid info for a given port to the meter.
 
         Note that this only stores the info on the meter - it does not
@@ -495,12 +496,12 @@ class CTidInfo:
         Raises CTidInfoError on errors.
 
         """
-        if isinstance(port_info, list):
-            resource = "/ctid"
-            data = {"info": [pi.as_dict() for pi in port_info]}
-        else:
+        if isinstance(port_info, PortInfo):
             resource = f"/ctid/{port_info.port}"
             data = port_info.as_dict()
+        else:
+            resource = "/ctid"
+            data = {"info": [pi.as_dict() for pi in port_info]}
         reply = self.dev.put(resource, json_data=data)
         if reply is None:
             raise CTidInfoError("PUT of CTid info failed.")

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge/webapi/device/register.py

@@ -36,6 +36,7 @@ import json
 from deprecated import deprecated
 
 from ..error import Error
+from ..json_api import JSONAPIError
 from .device import Device
 from .physical_quantity import PhysicalQuantity
 from .register_row import RegisterRow
@@ -115,13 +116,10 @@ class Register:
             reg_ranges = regnames_to_ranges(dev, regs)
             if reg_ranges is not None:
                 params["reg"] = reg_ranges
-        self.raw = self.dev.get("/register", params=params, **kwargs)
-        if self.raw is None:
-            raise RegisterError("Failed to read register data.", params)
-        if "error" in self.raw:
-            raise RegisterError(
-                "Error reading register data.", self.raw["error"]
-            )
+        try:
+            self.raw = self.dev.get("/register", params=params, **kwargs)
+        except JSONAPIError as e:
+            raise RegisterError("failed to read registers: {e}", params) from e
 
     def _create_regorder(self) -> dict[str, int]:
         """Create a dictionary mapping a register name to the index

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.9.1
+Version: 0.9.2
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Provides-Extra: examples
+Provides-Extra: pyside
 License-File: LICENSE
 
 # eGauge open source Python code
@@ -27,6 +28,15 @@ Please see LICENSE for details.  eGauge Systems LLC reserves the
 rights to add, modify, or remove code from this repository or the
 entire repository without notice.
 
+## egauge.pyside.terminal Support
+
+To use module `egauge.pyside.terminal`, be sure to install the package
+with the `pyside` extra dependencies:
+
+```sh
+pip install egauge-python[pyside]
+```
+
 ## Example Programs
 
 Example programs can be found in the `egauge.examples` module.  If you

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge_python.egg-info/requires.txt

@@ -1,11 +1,11 @@
-PySide6
 crcmod
 deprecated
 intelhex
 requests>=2.4.2
-wheel
 
 [examples]
 matplotlib
-pytz
 readchar
+
+[pyside]
+PySide6

{egauge-python-0.9.1 → egauge-python-0.9.2}/egauge_python.egg-info/top_level.txt

@@ -1,2 +1,3 @@
+build
 dist
 egauge

{egauge-python-0.9.1 → egauge-python-0.9.2}/setup.py

@@ -10,17 +10,18 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setuptools.setup(
     name="egauge-python",
-    version="0.9.1",
+    version="0.9.2",
     packages=setuptools.find_namespace_packages(include="egauge.*"),
     install_requires=[
         "crcmod",
         "deprecated",
         "intelhex",
-        "wheel",
         "requests>=2.4.2",
-        "PySide6",
     ],
-    extras_require={"examples": ["matplotlib", "pytz", "readchar"]},
+    extras_require={
+        "examples": ["matplotlib", "readchar"],
+        "pyside": ["PySide6"],
+    },
     include_package_data=True,
     entry_points={
         "console_scripts": ["ctid-encoder = egauge.ctid.encoder:main"]

egauge-python-0.9.1/egauge/ctid/__init__.py

@@ -1,4 +0,0 @@
-from .bit_stuffer import *  # NOQA
-from .ctid import *  # NOQA
-from .waveform import *  # NOQA
-from .intel_hex_encoder import intel_hex_encode as intel_hex_encode