p3lib 1.1.113__tar.gz → 1.1.115__tar.gz

{p3lib-1.1.113 → p3lib-1.1.115}/PKG-INFO

@@ -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 → p3lib-1.1.115}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "p3lib"
-version = "1.1.113"
+version = "1.1.115"
 description = "A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output."
 authors = ["Paul Austen <pjaos@gmail.com>"]
 license = "MIT License"
 readme = "README.md"
-homepage = "https://github.com/pjaos/test_equipment"
-repository = "https://github.com/pjaos/test_equipment"
+homepage = "https://github.com/pjaos/p3lib"
+repository = "https://github.com/pjaos/p3lib"
 
 [build-system]
 requires = [

{p3lib-1.1.113 → p3lib-1.1.115}/src/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