p3lib 1.1.113__py2.py3-none-any.whl → 1.1.115__py2.py3-none-any.whl

p3lib/ngt.py

@@ -13,6 +13,8 @@ from time import sleep
 from queue import Queue
 from time import time, strftime, localtime
 
+from p3lib.helper import getProgramVersion
+
 from nicegui import ui
 
 class TabbedNiceGui(object):
@@ -78,29 +80,7 @@ class TabbedNiceGui(object):
     def GetProgramVersion():
         """@brief Get the program version from the poetry pyproject.toml file.
            @return The version of the installed program (string value)."""
-        poetryConfigFile = os.path.join(TabbedNiceGui.LOCAL_PATH, TabbedNiceGui.POETRY_CONFIG_FILE)
-        if not os.path.isfile(poetryConfigFile):
-            poetryConfigFile = os.path.join(TabbedNiceGui.LOCAL_PATH, ".." + os.sep + TabbedNiceGui.POETRY_CONFIG_FILE)
-            poetryConfigFile2 = poetryConfigFile
-            if not os.path.isfile(poetryConfigFile):
-                cwd = os.getcwd()
-                poetryConfigFile = os.path.join(cwd, TabbedNiceGui.POETRY_CONFIG_FILE)
-                if not os.path.isfile(poetryConfigFile):
-                    raise Exception(f"{poetryConfigFile}, {poetryConfigFile2} and {poetryConfigFile} not found.")
-
-        programVersion = None
-        with open(poetryConfigFile, 'r') as fd:
-            lines = fd.readlines()
-            for line in lines:
-                line=line.strip("\r\n")
-                if line.startswith('version'):
-                    elems = line.split("=")
-                    if len(elems) == 2:
-                        programVersion = elems[1].strip('" ')
-                        break
-        if programVersion is None:
-            raise Exception(f"Failed to extract program version from '{line}' line of {poetryConfigFile} file.")
-        return programVersion
+        return getProgramVersion()
 
     def __init__(self, debugEnabled, logPath=None):
         """@brief Constructor

{p3lib-1.1.113.dist-info → p3lib-1.1.115.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.113
+Version: 1.1.115
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
-Home-page: https://github.com/pjaos/test_equipment
+Home-page: https://github.com/pjaos/p3lib
 License: MIT
 Author: Paul Austen
 Author-email: pjaos@gmail.com
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Project-URL: Repository, https://github.com/pjaos/test_equipment
+Project-URL: Repository, https://github.com/pjaos/p3lib
 Description-Content-Type: text/markdown
 
 # A Python3 library

{p3lib-1.1.113.dist-info → p3lib-1.1.115.dist-info}/RECORD

@@ -13,12 +13,12 @@ p3lib/login.html,sha256=DADTJGuvWQ-LTO4X6SaFdqK7JMW03DAa3lRieGD0d6g,2748
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
 p3lib/netif.py,sha256=3QV5OGdHhELIf4MBj6mx5MNCtVeZ7JXoNEkeu4KzCaE,9796
 p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
-p3lib/ngt.py,sha256=hdS60qKm9x1j5XG2VOVFxO1RLe5pEcCSsaqP-TZF3Cc,40053
+p3lib/ngt.py,sha256=NLZy-obwpDKYP5dcW8A6aNGS55t5yqsafOpJ0iVThLw,38883
 p3lib/pconfig.py,sha256=wGC6UJAIBksRjwKTfaw3Y6vAMkgey0QC2nhkCtqj1MQ,37738
 p3lib/ssh.py,sha256=OyoAQ_h1L2RfkjTAChDrvLFfl4Fe_gBNdX5rvK-wKiw,42125
 p3lib/table_plot.py,sha256=RPncwVlGUkkx5Fw0dHQedXo0TSPlTi__VrJBDzaMsuI,32116
 p3lib/uio.py,sha256=Aaxc99XiE3d2f9vLjaN-bZsckoNxay5t0ujdK6PXGrw,23265
-p3lib-1.1.113.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.113.dist-info/METADATA,sha256=u9t7fR-cvcPUXfQ6jomlNFVOKd2FOa1oPEFla_6HkVE,1337
-p3lib-1.1.113.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-p3lib-1.1.113.dist-info/RECORD,,
+p3lib-1.1.115.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.115.dist-info/METADATA,sha256=Rmm1RFbcyjFCUu00p1Z7xWZXhn9YtnuNuINBNeomVL0,1319
+p3lib-1.1.115.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+p3lib-1.1.115.dist-info/RECORD,,