egauge-python 0.7.4__tar.gz → 0.8.0__tar.gz

{egauge-python-0.7.4/egauge_python.egg-info → egauge-python-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.7.4
+Version: 0.8.0
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -69,9 +69,9 @@ The classes in this module support manufacturing CTid® sensors.  CTid®
 is patented technology and shall be used in accordance with the
 licensing agreements governing its use.
 
-### egauge.pyside2
+### egauge.pyside
 
-The classes in this module support QT5-based graphical
+The classes in this module support QT6-based graphical
 user-interfaces.
 
 ## Source Code Conventions

{egauge-python-0.7.4 → egauge-python-0.8.0}/README.md

@@ -49,9 +49,9 @@ The classes in this module support manufacturing CTid® sensors.  CTid®
 is patented technology and shall be used in accordance with the
 licensing agreements governing its use.
 
-### egauge.pyside2
+### egauge.pyside
 
-The classes in this module support QT5-based graphical
+The classes in this module support QT6-based graphical
 user-interfaces.
 
 ## Source Code Conventions

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

@@ -0,0 +1,3 @@
+from .bit_stuffer import * # NOQA
+from .ctid import *  # NOQA
+from .waveform import *  # NOQA

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/ctid/ctid.py

@@ -35,7 +35,6 @@ import crcmod
 
 from .bit_stuffer import BitStuffer
 
-
 CTID_VERSION = 5  # latest version of CTid Specification this code supports
 START_SYM = 0xFF
 

{egauge-python-0.7.4/egauge/pyside2 → egauge-python-0.8.0/egauge/pyside}/ansi2html.py

@@ -40,9 +40,8 @@
      ESC [ 41 m:        Background-color red.
      ESC [ 32 m:        Foreground-color red.
    """
-import re
-
 import html
+import re
 
 HTML_STYLE = {
     1: "font-weight:bold",

{egauge-python-0.7.4/egauge/pyside2 → egauge-python-0.8.0/egauge/pyside}/terminal.py

@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2014, 2016-2017, 2020 eGauge Systems LLC
+#   Copyright (c) 2014, 2016-2017, 2020, 2024 eGauge Systems LLC
 #       1644 Conestoga St, Suite 2
 #       Boulder, CO 80301
 #       voice: 720-545-9767
@@ -31,8 +31,8 @@
 
 import re
 
-from PySide2.QtWidgets import QApplication
-from PySide2.QtGui import QCursor, QTextCursor
+from PySide6.QtGui import QCursor, QTextCursor
+from PySide6.QtWidgets import QApplication
 
 from . import ansi2html
 
@@ -184,9 +184,10 @@ if __name__ == "__main__":
     test_incomplete_ansi_csi("s")  # save cursor position
 
     import sys
-    from PySide2 import QtCore, QtWidgets
-    from PySide2.QtCore import Qt, QBasicTimer
-    from PySide2.QtWidgets import QApplication, QMainWindow, QMessageBox
+
+    from PySide6 import QtCore, QtWidgets
+    from PySide6.QtCore import QBasicTimer
+    from PySide6.QtWidgets import QApplication, QMainWindow
 
     class Ui_MainWindow:
         def setupUi(self, MainWindow):
@@ -213,7 +214,7 @@ if __name__ == "__main__":
                 QtWidgets.QPlainTextEdit.WidgetWidth
             )
             self.plainTextEdit.setReadOnly(True)
-            self.plainTextEdit.setTabStopWidth(80)
+            self.plainTextEdit.setTabStopDistance(80)
             self.plainTextEdit.setCursorWidth(16)
             self.plainTextEdit.setBackgroundVisible(False)
             self.plainTextEdit.setCenterOnScroll(False)
@@ -281,4 +282,4 @@ if __name__ == "__main__":
     window = QMainWindow()
     ui = UI()
     window.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/__init__.py

@@ -27,7 +27,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-from .auth import *
-from .error import *
-from . import cloud
-from . import device
+from .auth import *  # NOQA
+from .error import *  # NOQA
+from . import cloud  # NOQA
+from . import device  # NOQA

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/auth.py

@@ -35,7 +35,6 @@ import hashlib
 import os
 import secrets
 import types
-
 from functools import wraps
 from urllib.parse import urlparse
 
@@ -43,7 +42,6 @@ import requests
 
 from . import json_api
 
-
 # The name of the optional environment variable storing a token:
 ENV_EGAUGE_API_TOKEN = "EGAUGE_API_TOKEN"
 

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/cloud/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 eGauge Systems LLC
+# Copyright (c) 2020, 2024 eGauge Systems LLC
 #       1644 Conestoga St, Suite 2
 #       Boulder, CO 80301
 #       voice: 720-545-9767
@@ -27,4 +27,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-from .serial_number import *
+from .serial_number import *  # NOQA

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/cloud/credentials.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-#   Copyright (c) 2021-2022 eGauge Systems LLC
+#   Copyright (c) 2021-2022, 2024 eGauge Systems LLC
 #     1644 Conestoga St, Suite 2
 #     Boulder, CO 80301
 #     voice: 720-545-9767
@@ -23,7 +23,7 @@ from functools import partial
 
 import egauge.webapi.cloud.credentials
 
-    # this `self' is a Pyside2 Ui_MainWindow:
+    # this `self' is a Pyside6 Ui_MainWindow:
     auth = webapi.auth.TokenAuth(ask=partial(credentials.ask, self))
     self.sn_api = webapi.cloud.SerialNumber(auth=auth)
 
@@ -33,12 +33,13 @@ import egauge.webapi.cloud.credentials
 import getpass
 
 try:
-    from PySide2.QtWidgets import QDialog
+    from PySide6.QtWidgets import QDialog
+
     from .gui.credentials_dialog import Ui_Credentials_Dialog
 
-    have_pyside2 = True
+    have_pyside = True
 except ModuleNotFoundError:
-    have_pyside2 = False
+    have_pyside = False
 
     class QDialog:
         """Dummy class for use by Credentials_Dialog."""
@@ -58,12 +59,12 @@ class CredentialsManager:
         should set the previous_login_failed member to False after the
         credentials have been used successfully.
 
-        If GUI_PARENT is not None, it must be the QT5 (PySide2) parent
+        If GUI_PARENT is not None, it must be the QT5 (PySide6) parent
         window to use for the dialog.  If it is None, the credentials
         will be requested via standard I/O (getpass).
 
         """
-        self.parent = gui_parent if have_pyside2 else None
+        self.parent = gui_parent if have_pyside else None
         self.previous_login_failed = False
 
     def ask(self):
@@ -75,7 +76,7 @@ class CredentialsManager:
         """
         if self.parent:
             dialog = CredentialsDialog(self.parent, self.previous_login_failed)
-            dialog.exec_()
+            dialog.exec()
             if not dialog.accepted:
                 raise LoginCanceled()
             self.previous_login_failed = True
@@ -107,9 +108,9 @@ class CredentialsDialog(QDialog, Ui_Credentials_Dialog):
             self.prompt_label.setText(prompt)
         self.username_lineEdit.setFocus()
 
-    def exec_(self):
+    def exec(self):
         self.accepted = False
-        super().exec_()
+        super().exec()
 
     def accept(self):
         super().accept()

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/cloud/gui/credentials_dialog.py

@@ -3,15 +3,21 @@
 ################################################################################
 ## Form generated from reading UI file 'credentials_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 5.15.2
+## Created by: Qt User Interface Compiler version 6.7.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 
-from PySide2.QtCore import *
-from PySide2.QtGui import *
-from PySide2.QtWidgets import *
-
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QAbstractButton, QApplication, QDialog, QDialogButtonBox,
+    QGridLayout, QLabel, QLineEdit, QSizePolicy,
+    QVBoxLayout, QWidget)
 
 class Ui_Credentials_Dialog(object):
     def setupUi(self, Credentials_Dialog):

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/cloud/serial_number.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 eGauge Systems LLC
+# Copyright (c) 2020, 2024 eGauge Systems LLC
 #       1644 Conestoga St, Suite 2
 #       Boulder, CO 80301
 #       voice: 720-545-9767
@@ -32,11 +32,9 @@
 
 """
 import logging
-
 import urllib.parse
 
 from .. import json_api
-
 from ..error import Error
 
 log = logging.getLogger(__name__)
@@ -101,7 +99,7 @@ class SerialNumber:
         reply = self._post("models/allocate/", json_data=data)
         if reply is None:
             raise SerialNumberError("POST to allocate SN failed.", model_name)
-        if not "serial" in reply:
+        if "serial" not in reply:
             log.error(
                 "Failed to allocate SN: model=%s, reply=%s.", model_name, reply
             )

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/__init__.py

@@ -27,12 +27,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-from .capture import *
-from .ctid_info import *
-from .device import *
-from .local import *
-from .physical_quantity import *
-from .physical_units import *
-from .register import *
-from .register_row import *
-from .virtual_register import *
+from .capture import *  # NOQA
+from .ctid_info import *  # NOQA
+from .device import *  # NOQA
+from .local import *  # NOQA
+from .physical_quantity import *  # NOQA
+from .physical_units import *  # NOQA
+from .register import *  # NOQA
+from .register_row import *  # NOQA
+from .virtual_register import *  # NOQA

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/capture.py

@@ -29,16 +29,14 @@
 #
 """This module provides access to the eGauge WebAPI's /api/capture
 service."""
+import time
 from dataclasses import dataclass, field
 from decimal import Decimal
 from enum import Enum
 from typing import Dict, List, Optional, Union
 
-import time
-
-
-from .device import Device
 from ..error import Error
+from .device import Device
 
 
 class CaptureError(Error):
@@ -331,6 +329,7 @@ class Capture:
                 if ci >= len(channel_names):
                     ci = 0
                     sample_count += 1
+                name = channel_names[ci]
                 if cs is None:
                     continue  # we're not interested in this channel
                 cs.ts.append(dt)

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/ctid_info.py

@@ -35,8 +35,7 @@ import os
 import secrets
 import time
 
-from egauge import ctid
-from egauge import webapi
+from egauge import ctid, webapi
 
 from ..error import Error
 

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/device.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2022-2023 eGauge Systems LLC
+# Copyright (c) 2020, 2022-2024 eGauge Systems LLC
 #       1644 Conestoga St, Suite 2
 #       Boulder, CO 80301
 #       voice: 720-545-9767
@@ -29,6 +29,7 @@
 #
 """Module to provide access to a device's JSON WebAPI."""
 
+import socket
 from dataclasses import dataclass
 from types import SimpleNamespace
 from typing import List
@@ -63,12 +64,17 @@ class Device:
         server should be validated against.
 
         """
+        self.dev_uri = dev_uri
         self.api_uri = dev_uri + "/api"
         self.auth = auth
         self._reg_info = None  # cached register info
         self._chan_info = None  # cached channel info
         self._verify = verify
 
+    def __str__(self) -> str:
+        """Returns the URI used to access the device."""
+        return self.dev_uri
+
     def get(self, resource, **kwargs):
         """Issue GET request for /api resource RESOURCE and return the parsed
         JSON data or None if the request failed or returned invalid
@@ -194,3 +200,22 @@ class Device:
         """Clear the cached contents for this device."""
         self._reg_info = None
         self._chan_info = None
+
+    def is_up(self, timeout: float = 1) -> bool:
+        """Check if the device is up and running.
+
+        This method attempts to read /sys/time.  If a valid response
+        is received within the specified timeout, True is returned,
+        otherwise False is returned.
+
+        Keyword arguments:
+
+        timeout -- The maximum number of seconds to wait for a
+            response (default 1).
+
+        """
+        try:
+            ret = self.get("/sys/time", timeout=timeout)
+        except (json_api.JSONAPIError, socket.error):
+            ret = None
+        return ret is not None

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/local.py

@@ -30,11 +30,10 @@
 import decimal
 import json
 
+from ..error import Error
 from .register_row import RegisterRow
 from .register_type import RegisterType
 
-from ..error import Error
-
 
 class LocalError(Error):
     """All errors in this module raise this exception."""

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/physical_quantity.py

@@ -27,14 +27,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-from typing import List, Union
-
 import re
+from typing import List, Union
 
 from .physical_units import PhysicalValue
 from .register_type import RegisterType, Units, UnitSystem
 
-
 UNIT_PATTERN = re.compile(r"(.*)/(.*)$")
 
 

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/register_row.py

@@ -34,10 +34,9 @@ import json
 
 from deprecated import deprecated
 
-from .register_type import Units
-from .physical_quantity import PhysicalQuantity
-
 from ..error import Error
+from .physical_quantity import PhysicalQuantity
+from .register_type import Units
 
 
 class RegRowError(Error):

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/register_type.py

@@ -8,8 +8,13 @@
 
 from enum import Enum
 
-from .physical_units import AlternateUnit, PhysicalUnits, \
-    PhysicalUnitConversion, PrimaryUnit
+from .physical_units import (
+    AlternateUnit,
+    PhysicalUnitConversion,
+    PhysicalUnits,
+    PrimaryUnit,
+)
+
 
 class UnitSystem(Enum):
     METRIC = 0
@@ -330,11 +335,11 @@ def _create_units():
     p31 = PrimaryUnit("A·s")
     pus.add(p31)
 
-    c2 = PhysicalUnitConversion(False,
+    c3 = PhysicalUnitConversion(False,
         lambda x, t=None: (1/3600)*x,
         lambda x, t=None: 3600*x
     )
-    au = AlternateUnit("Ah", p31, c2)
+    au = AlternateUnit("Ah", p31, c3)
     pus.add(au)
     pus.add_scaled(au, "yAh", 1e+24, "yocto")
     pus.add_scaled(au, "zAh", 1e+21, "zepto")
@@ -353,41 +358,41 @@ def _create_units():
     pus.add_scaled(au, "ZAh", 1 / 1e+21, "zetta")
     pus.add_scaled(au, "YAh", 1 / 1e+24, "yotta")
 
-    c9 = PhysicalUnitConversion(False,
+    c11 = PhysicalUnitConversion(False,
         lambda x, t=None: (1/100)*x,
         lambda x, t=None: 100*x
     )
-    au = AlternateUnit("hPa", p24, c9)
+    au = AlternateUnit("hPa", p24, c11)
     pus.add(au)
 
-    c10 = PhysicalUnitConversion(False,
+    c12 = PhysicalUnitConversion(False,
         lambda x, t=None: 1.0e-5*x,
         lambda x, t=None: 100000.0*x
     )
-    au = AlternateUnit("bar", p24, c10)
+    au = AlternateUnit("bar", p24, c12)
     pus.add(au)
 
-    c11 = PhysicalUnitConversion(False,
+    c13 = PhysicalUnitConversion(False,
         lambda x, t=None: 0.00014503773773*x,
         lambda x, t=None: 6894.7572931783*x
     )
-    au = AlternateUnit("psi", p24, c11)
+    au = AlternateUnit("psi", p24, c13)
     pus.add(au)
 
-    c12 = PhysicalUnitConversion(False,
+    c14 = PhysicalUnitConversion(False,
         lambda x, t=None: 0.000295300999981497*x,
         lambda x, t=None: 3386.375258*x
     )
-    au = AlternateUnit("inHg", p24, c12)
+    au = AlternateUnit("inHg", p24, c14)
     pus.add(au)
-    au = AlternateUnit("psi·s", p25, c11)
+    au = AlternateUnit("psi·s", p25, c13)
     pus.add(au)
-    au = AlternateUnit("inHg·s", p25, c12)
+    au = AlternateUnit("inHg·s", p25, c14)
     pus.add(au)
 
     p32 = PrimaryUnit("VA·s")
     pus.add(p32)
-    au = AlternateUnit("VAh", p32, c2)
+    au = AlternateUnit("VAh", p32, c3)
     pus.add(au)
     pus.add_scaled(au, "yVAh", 1e+24, "yocto")
     pus.add_scaled(au, "zVAh", 1e+21, "zepto")
@@ -408,7 +413,7 @@ def _create_units():
 
     p33 = PrimaryUnit("V·s")
     pus.add(p33)
-    au = AlternateUnit("Vh", p33, c2)
+    au = AlternateUnit("Vh", p33, c3)
     pus.add(au)
     pus.add_scaled(au, "yVh", 1e+24, "yocto")
     pus.add_scaled(au, "zVh", 1e+21, "zepto")
@@ -442,9 +447,16 @@ def _create_units():
     pus.add(au)
     pus.add_scaled(au, "MBH", 1 / 1000)
 
+    c2 = PhysicalUnitConversion(False,
+        lambda x, t=None: 3.412141633e-5*x,
+        lambda x, t=None: 29307.1070183211*x
+    )
+    au = AlternateUnit("therm/h", p0, c2)
+    pus.add(au)
+
     p34 = PrimaryUnit("W·s")
     pus.add(p34)
-    au = AlternateUnit("Wh", p34, c2)
+    au = AlternateUnit("Wh", p34, c3)
     pus.add(au)
     pus.add_scaled(au, "yWh", 1e+24, "yocto")
     pus.add_scaled(au, "zWh", 1e+21, "zepto")
@@ -463,23 +475,30 @@ def _create_units():
     pus.add_scaled(au, "ZWh", 1 / 1e+21, "zetta")
     pus.add_scaled(au, "YWh", 1 / 1e+24, "yotta")
 
-    c3 = PhysicalUnitConversion(False,
+    c4 = PhysicalUnitConversion(False,
         lambda x, t=None: x,
         lambda x, t=None: x
     )
-    au = AlternateUnit("J", p34, c3)
+    au = AlternateUnit("J", p34, c4)
     pus.add(au)
 
-    c4 = PhysicalUnitConversion(False,
+    c5 = PhysicalUnitConversion(False,
         lambda x, t=None: 0.000947817077749151*x,
         lambda x, t=None: 1055.0559*x
     )
-    au = AlternateUnit("Btu", p34, c4)
+    au = AlternateUnit("Btu", p34, c5)
+    pus.add(au)
+
+    c6 = PhysicalUnitConversion(False,
+        lambda x, t=None: 9.47817077749151e-9*x,
+        lambda x, t=None: 105505590.0*x
+    )
+    au = AlternateUnit("therm", p34, c6)
     pus.add(au)
 
     p35 = PrimaryUnit("W·s/m²")
     pus.add(p35)
-    au = AlternateUnit("Wh/m²", p35, c2)
+    au = AlternateUnit("Wh/m²", p35, c3)
     pus.add(au)
     pus.add_scaled(au, "yWh/m²", 1e+24, "yocto")
     pus.add_scaled(au, "zWh/m²", 1e+21, "zepto")
@@ -498,55 +517,55 @@ def _create_units():
     pus.add_scaled(au, "ZWh/m²", 1 / 1e+21, "zetta")
     pus.add_scaled(au, "YWh/m²", 1 / 1e+24, "yotta")
 
-    c18 = PhysicalUnitConversion(False,
+    c20 = PhysicalUnitConversion(False,
         lambda x, t=None: 0.00220462*x,
         lambda x, t=None: 453.59290943564*x
     )
-    au = AlternateUnit("lbs", p27, c18)
+    au = AlternateUnit("lbs", p27, c20)
     pus.add(au)
 
-    c19 = PhysicalUnitConversion(False,
+    c21 = PhysicalUnitConversion(False,
         lambda x, t=None: 1.0e-6*x,
         lambda x, t=None: 1000000.0*x
     )
-    au = AlternateUnit("T", p27, c19)
+    au = AlternateUnit("T", p27, c21)
     pus.add(au)
     pus.add_scaled(au, "kT", 1 / 1000, "kiloton")
     pus.add_scaled(au, "MT", 1 / 1000000, "megaton")
     pus.add_scaled(au, "GT", 1 / 1000000000, "gigaton")
     pus.add_scaled(au, "TT", 1 / 1000000000000, "teraton")
     pus.add_scaled(au, "PT", 1 / 1000000000000000, "petaton")
-    au = AlternateUnit("lbs/s", p10, c18)
+    au = AlternateUnit("lbs/s", p10, c20)
     pus.add(au)
-    au = AlternateUnit("lbs·s", p28, c18)
+    au = AlternateUnit("lbs·s", p28, c20)
     pus.add(au)
 
-    c15 = PhysicalUnitConversion(False,
+    c17 = PhysicalUnitConversion(False,
         lambda x, t=None: 1.09361329833771*x,
         lambda x, t=None: 0.9144*x
     )
-    au = AlternateUnit("yd", p12, c15)
+    au = AlternateUnit("yd", p12, c17)
     pus.add(au)
 
-    c16 = PhysicalUnitConversion(False,
+    c18 = PhysicalUnitConversion(False,
         lambda x, t=None: 3.28083989501312*x,
         lambda x, t=None: 0.3048*x
     )
-    au = AlternateUnit("ft", p12, c16)
+    au = AlternateUnit("ft", p12, c18)
     pus.add(au)
 
-    c17 = PhysicalUnitConversion(False,
+    c19 = PhysicalUnitConversion(False,
         lambda x, t=None: 0.000621371192237334*x,
         lambda x, t=None: 1609.344*x
     )
-    au = AlternateUnit("mi", p12, c17)
+    au = AlternateUnit("mi", p12, c19)
     pus.add(au)
 
-    c13 = PhysicalUnitConversion(False,
+    c15 = PhysicalUnitConversion(False,
         lambda x, t=None: 3600*x,
         lambda x, t=None: (1/3600)*x
     )
-    au = AlternateUnit("m/h", p11, c13)
+    au = AlternateUnit("m/h", p11, c15)
     pus.add(au)
     pus.add_scaled(au, "ym/h", 1e+24, "yocto")
     pus.add_scaled(au, "zm/h", 1e+21, "zepto")
@@ -565,70 +584,98 @@ def _create_units():
     pus.add_scaled(au, "Zm/h", 1 / 1e+21, "zetta")
     pus.add_scaled(au, "Ym/h", 1 / 1e+24, "yotta")
 
-    c14 = PhysicalUnitConversion(False,
+    c16 = PhysicalUnitConversion(False,
         lambda x, t=None: 2.2369362920544*x,
         lambda x, t=None: 0.44704*x
     )
-    au = AlternateUnit("mph", p11, c14)
+    au = AlternateUnit("mph", p11, c16)
     pus.add(au)
 
     p36 = PrimaryUnit("m³")
     pus.add(p36)
 
-    c20 = PhysicalUnitConversion(False,
+    c22 = PhysicalUnitConversion(False,
         lambda x, t=None: 1000.0*x,
         lambda x, t=None: 0.001*x
     )
-    au = AlternateUnit("L", p36, c20)
+    au = AlternateUnit("L", p36, c22)
     pus.add(au)
 
-    c23 = PhysicalUnitConversion(False,
+    c25 = PhysicalUnitConversion(False,
         lambda x, t=None: 264.200792602378*x,
         lambda x, t=None: 0.003785*x
     )
-    au = AlternateUnit("gal", p36, c23)
+    au = AlternateUnit("gal", p36, c25)
     pus.add(au)
-    au = AlternateUnit("L/s", p23, c20)
+
+    c30 = PhysicalUnitConversion(False,
+        lambda x, t=None: 35.314667*x,
+        lambda x, t=None: 0.0283168463686774*x
+    )
+    au = AlternateUnit("ft³", p36, c30)
     pus.add(au)
 
-    c21 = PhysicalUnitConversion(False,
+    c31 = PhysicalUnitConversion(False,
+        lambda x, t=None: 0.35314667*x,
+        lambda x, t=None: 2.83168463686774*x
+    )
+    au = AlternateUnit("ccf", p36, c31)
+    pus.add(au)
+    au = AlternateUnit("L/s", p23, c22)
+    pus.add(au)
+
+    c23 = PhysicalUnitConversion(False,
         lambda x, t=None: 60000.0*x,
         lambda x, t=None: 1.66666666666667e-5*x
     )
-    au = AlternateUnit("L/m", p23, c21)
+    au = AlternateUnit("L/m", p23, c23)
     pus.add(au)
 
-    c22 = PhysicalUnitConversion(False,
+    c24 = PhysicalUnitConversion(False,
         lambda x, t=None: 3600000.0*x,
         lambda x, t=None: 2.77777777777778e-7*x
     )
-    au = AlternateUnit("L/h", p23, c22)
+    au = AlternateUnit("L/h", p23, c24)
     pus.add(au)
-    au = AlternateUnit("gal/s", p23, c23)
+    au = AlternateUnit("gal/s", p23, c25)
     pus.add(au)
 
-    c24 = PhysicalUnitConversion(False,
+    c26 = PhysicalUnitConversion(False,
         lambda x, t=None: 15852.0475561427*x,
         lambda x, t=None: 6.30833333333334e-5*x
     )
-    au = AlternateUnit("gpm", p23, c24)
+    au = AlternateUnit("gpm", p23, c26)
     pus.add(au)
 
-    c25 = PhysicalUnitConversion(False,
+    c27 = PhysicalUnitConversion(False,
         lambda x, t=None: 951122.85336856*x,
         lambda x, t=None: 1.05138888888889e-6*x
     )
-    au = AlternateUnit("gph", p23, c25)
+    au = AlternateUnit("gph", p23, c27)
+    pus.add(au)
+
+    c28 = PhysicalUnitConversion(False,
+        lambda x, t=None: 127132.8012*x,
+        lambda x, t=None: 7.86579065796593e-6*x
+    )
+    au = AlternateUnit("ft³/h", p23, c28)
+    pus.add(au)
+
+    c29 = PhysicalUnitConversion(False,
+        lambda x, t=None: 1271.328012*x,
+        lambda x, t=None: 0.000786579065796593*x
+    )
+    au = AlternateUnit("ccf/h", p23, c29)
     pus.add(au)
 
     p37 = PrimaryUnit("m·s")
     pus.add(p37)
-    au = AlternateUnit("ft·s", p37, c16)
+    au = AlternateUnit("ft·s", p37, c18)
     pus.add(au)
 
     p38 = PrimaryUnit("var·s")
     pus.add(p38)
-    au = AlternateUnit("vahr", p38, c2)
+    au = AlternateUnit("vahr", p38, c3)
     pus.add(au)
     pus.add_scaled(au, "yvahr", 1e+24, "yocto")
     pus.add_scaled(au, "zvahr", 1e+21, "zepto")
@@ -647,42 +694,42 @@ def _create_units():
     pus.add_scaled(au, "Zvahr", 1 / 1e+21, "zetta")
     pus.add_scaled(au, "Yvahr", 1 / 1e+24, "yotta")
 
-    c5 = PhysicalUnitConversion(False,
+    c7 = PhysicalUnitConversion(False,
         lambda x, t=None: (9/5)*x + 32,
         lambda x, t=None: (5/9)*x - 160/9,
         lambda x, t=None: (9/5)*x,
         lambda y, t=None: (5/9)*y
     )
-    au = AlternateUnit("°F", p8, c5)
+    au = AlternateUnit("°F", p8, c7)
     pus.add(au)
 
-    c6 = PhysicalUnitConversion(False,
+    c8 = PhysicalUnitConversion(False,
         lambda x, t=None: x + 273.15,
         lambda x, t=None: x - 273.15,
         lambda x, t=None: x,
         lambda y, t=None: y
     )
-    au = AlternateUnit("°K", p8, c6)
+    au = AlternateUnit("°K", p8, c8)
     pus.add(au)
 
-    c7 = PhysicalUnitConversion(True,
+    c9 = PhysicalUnitConversion(True,
         lambda x, t=None: 273.15*t + x,
         lambda x, t=None: -273.15*t + x,
         lambda x, t=None: x,
         lambda y, t=None: y
     )
-    au = AlternateUnit("°K·s", p9, c7)
+    au = AlternateUnit("°K·s", p9, c9)
     pus.add(au)
     pus.add_scaled(au, "°K·h", 1 / 3600, "Kelvin degree hours")
     pus.add_scaled(au, "°K·d", 1 / 86400, "Kelvin degree days")
 
-    c8 = PhysicalUnitConversion(True,
+    c10 = PhysicalUnitConversion(True,
         lambda x, t=None: 32*t + (9/5)*x,
         lambda x, t=None: -160/9*t + (5/9)*x,
         lambda x, t=None: (9/5)*x,
         lambda y, t=None: (5/9)*y
     )
-    au = AlternateUnit("°F·s", p9, c8)
+    au = AlternateUnit("°F·s", p9, c10)
     pus.add(au)
     pus.add_scaled(au, "°F·h", 1 / 3600, "Fahrenheight degree hours")
     pus.add_scaled(au, "°F·d", 1 / 86400, "Fahrenheit degree days")

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/device/virtual_register.py

@@ -27,16 +27,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
+import re
 from dataclasses import dataclass
-from enum import auto, Enum
+from enum import Enum, auto
 from types import SimpleNamespace
 from typing import Callable, List
 
-import re
-
 from ..error import Error
 
-
 ID_PATTERN = re.compile(r"[A-Z]+")
 NUMBER_PATTERN = re.compile(r"(\d+)")
 

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge/webapi/json_api.py

@@ -80,7 +80,7 @@ def get(resource, **kwargs):
         raise UnauthenticatedError(r)
     if r.status_code < 200 or r.status_code > 299:
         if log.getEffectiveLevel() <= logging.DEBUG:
-            log.exception(
+            log.debug(
                 "HTTP GET status code %s.  Keyword args: %s",
                 r.status_code,
                 kwargs,
@@ -124,7 +124,7 @@ def patch(resource, json_data, **kwargs):
         raise UnauthenticatedError(r)
     if not 200 <= r.status_code <= 299:
         if log.getEffectiveLevel() <= logging.DEBUG:
-            log.exception(
+            log.debug(
                 "HTTP PATCH status code %s.  "
                 "Resource %s, Data: %s, keyword args: %s",
                 r.status_code,
@@ -171,7 +171,7 @@ def put(resource, json_data, **kwargs):
         raise UnauthenticatedError(r)
     if not 200 <= r.status_code <= 299:
         if log.getEffectiveLevel() <= logging.DEBUG:
-            log.exception(
+            log.debug(
                 "HTTP PUT status code %s.  "
                 "Resource %s, Data: %s, keyword args: %s",
                 r.status_code,
@@ -218,7 +218,7 @@ def post(resource, json_data, **kwargs):
         raise UnauthenticatedError(r)
     if not 200 <= r.status_code <= 299:
         if log.getEffectiveLevel() <= logging.DEBUG:
-            log.exception(
+            log.debug(
                 "HTTP POST status code %s.  "
                 "Resource %s, Data: %s, keyword args: %s",
                 r.status_code,
@@ -261,7 +261,7 @@ def delete(resource, **kwargs):
         raise UnauthenticatedError(r)
     if r.status_code < 200 or r.status_code > 299:
         if log.getEffectiveLevel() <= logging.DEBUG:
-            log.exception(
+            log.debug(
                 "HTTP DELETE status code %s.  Keyword args: %s",
                 r.status_code,
                 kwargs,

{egauge-python-0.7.4 → egauge-python-0.8.0/egauge_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.7.4
+Version: 0.8.0
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -69,9 +69,9 @@ The classes in this module support manufacturing CTid® sensors.  CTid®
 is patented technology and shall be used in accordance with the
 licensing agreements governing its use.
 
-### egauge.pyside2
+### egauge.pyside
 
-The classes in this module support QT5-based graphical
+The classes in this module support QT6-based graphical
 user-interfaces.
 
 ## Source Code Conventions

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge_python.egg-info/SOURCES.txt

@@ -7,9 +7,9 @@ egauge/ctid/bit_stuffer.py
 egauge/ctid/ctid.py
 egauge/ctid/encoder.py
 egauge/ctid/waveform.py
-egauge/pyside2/__init__.py
-egauge/pyside2/ansi2html.py
-egauge/pyside2/terminal.py
+egauge/pyside/__init__.py
+egauge/pyside/ansi2html.py
+egauge/pyside/terminal.py
 egauge/webapi/__init__.py
 egauge/webapi/auth.py
 egauge/webapi/error.py

{egauge-python-0.7.4 → egauge-python-0.8.0}/egauge_python.egg-info/requires.txt

@@ -1,9 +1,9 @@
+PySide6
 crcmod
 deprecated
 intelhex
-wheel
-pexpect
 requests>=2.4.2
+wheel
 
 [examples]
 matplotlib

{egauge-python-0.7.4 → egauge-python-0.8.0}/examples/test_capture.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2023 eGauge Systems LLC
+# Copyright (c) 2023-2024 eGauge Systems LLC
 #
 # See LICENSE file for details.
 #
@@ -28,9 +28,8 @@ Alternatively, you can edit examples/test_common.py to suit your needs.
 
 import sys
 
-from matplotlib import pyplot
-
 import test_common
+from matplotlib import pyplot
 
 from egauge.webapi.device import Capture, TriggerMode
 

{egauge-python-0.7.4 → egauge-python-0.8.0}/examples/test_ctid.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2023 eGauge Systems LLC
+# Copyright (c) 2023-2024 eGauge Systems LLC
 #
 # See LICENSE file for details.
 #
@@ -27,7 +27,6 @@ Alternatively, you can edit examples/test_common.py to suit your needs.
 import sys
 
 import readchar
-
 import test_common
 
 from egauge.webapi.device import CTidInfo, PortInfo

{egauge-python-0.7.4 → egauge-python-0.8.0}/examples/test_register.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (c) 2023 eGauge Systems LLC
+# Copyright (c) 2023-2024 eGauge Systems LLC
 #
 # See LICENSE file for details.
 #
@@ -32,14 +32,12 @@ Alternatively, you can edit examples/test_common.py to suit your needs.
 """
 
 import argparse
-
 from datetime import datetime
 
 import pytz
-
 import test_common
 
-from egauge.webapi.device import Register, PhysicalQuantity, UnitSystem
+from egauge.webapi.device import PhysicalQuantity, Register, UnitSystem
 
 parser = argparse.ArgumentParser(
     description="Demonstrate the use of class egauge.webapi.device.Register."

egauge-python-0.8.0/pyproject.toml

@@ -0,0 +1,10 @@
+[tool.ruff]
+line-length = 79
+
+exclude = [
+        "egauge/webapi/cloud/gui/*.py"
+]
+
+[tool.ruff.lint]
+extend-select = ["I", "SLF"]
+ignore = ["E741"]

{egauge-python-0.7.4 → egauge-python-0.8.0}/setup.py

@@ -1,4 +1,5 @@
 import os
+
 import setuptools
 
 with open(os.path.join(os.path.dirname(__file__), "README.md")) as readme:
@@ -9,15 +10,15 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setuptools.setup(
     name="egauge-python",
-    version="0.7.4",
+    version="0.8.0",
     packages=setuptools.find_namespace_packages(include="egauge.*"),
     install_requires=[
         "crcmod",
         "deprecated",
         "intelhex",
         "wheel",
-        "pexpect",
         "requests>=2.4.2",
+        "PySide6",
     ],
     extras_require={
         "examples": [

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

@@ -1,3 +0,0 @@
-from .bit_stuffer import *
-from .ctid import *
-from .waveform import *

egauge-python-0.7.4/pyproject.toml

@@ -1,3 +0,0 @@
-[tool.black]
-line-length = 79
-extend-exclude = '/gui/'