p3lib 1.1.109__py2.py3-none-any.whl → 1.1.111__py2.py3-none-any.whl

p3lib/helper.py

@@ -273,7 +273,7 @@ def getHomePath():
     if platform.system() == 'Linux' and os.geteuid() == 0:
         # Fix for os.environ["HOME"] returning /home/root sometimes.
         return '/root/'
-    
+
     elif "HOME" in os.environ:
         return os.environ["HOME"]
 
@@ -383,7 +383,8 @@ def getAbsFile(filename):
                 1 - The startup folder
                 2 - An 'assets' folder in the startup folder
                 3 - An 'assets' folder in the startup parent folder
-                3 - In an 'assets' folder in a python site-packages folder.
+                4 - In a site-packages folder.
+                5 - In an 'assets' folder in a python site-packages folder.
         @param filename The name of the icon file.
         @return The abs path of the file or None if not found."""
     file_found = None
@@ -411,10 +412,37 @@ def getAbsFile(filename):
                 for path in sys.path:
                     if 'site-packages' in path:
                         site_packages_path = path
-                        path3 = os.path.join(site_packages_path, 'assets')
-                        abs_filename = os.path.join(path3, filename)
+                        abs_filename = os.path.join(site_packages_path, filename)
+                        print(f"PJA: abs_filename={abs_filename}, FOUND={os.path.isfile(abs_filename)}")
                         if os.path.isfile(abs_filename):
                             file_found = abs_filename
-                            break
 
-    return file_found
+                        else:
+                            path3 = os.path.join(site_packages_path, 'assets')
+                            abs_filename = os.path.join(path3, filename)
+                            if os.path.isfile(abs_filename):
+                                file_found = abs_filename
+                                break
+
+    return file_found
+
+PYPROJECT_FILE = "pyproject.toml"
+
+def getProgramVersion():
+    """@return The program/package version. This comes from the pyproject.toml file.
+               If this file is not found an exception is thrown.  """
+    poetryConfigFile = getAbsFile(PYPROJECT_FILE)
+    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
+

{p3lib-1.1.109.dist-info → p3lib-1.1.111.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.109
+Version: 1.1.111
 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
 License: MIT

{p3lib-1.1.109.dist-info → p3lib-1.1.111.dist-info}/RECORD

@@ -7,7 +7,7 @@ p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
 p3lib/database_if.py,sha256=XKu1w3zftGbj4Rh54wrWJnoCtqHkhCzJUPN2S70XIKg,11915
 p3lib/file_io.py,sha256=A7_GKYPlmjRjq6U1YuWhmB0OhLhNm6cWQfQX8qfgYTk,5041
 p3lib/gnome_desktop_app.py,sha256=zl9SKRBV8ipVg2faCs_gbAr8c42J1N_pntbFGG2BMiE,6694
-p3lib/helper.py,sha256=RHA0T1ckG3wLgTXgI_1mrtbzvMBaIwd8ow7x9orXUfA,13730
+p3lib/helper.py,sha256=DYfGYC7hmaZZJVivgnOHQGln5tJshZfJEC0KRIda7QU,14923
 p3lib/json_networking.py,sha256=6u4s1SmypjTYPnSxHP712OgQ3ZJaxOqIkgHQ1J7Qews,9738
 p3lib/login.html,sha256=DADTJGuvWQ-LTO4X6SaFdqK7JMW03DAa3lRieGD0d6g,2748
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
@@ -18,7 +18,7 @@ p3lib/pconfig.py,sha256=k1WHvmHzOfmkSbP7CrFyT1iTwn5_UROQjk6gltdh7bk,37280
 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.109.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.109.dist-info/METADATA,sha256=kOt7WY42n-MJAlJujZXyFJo9hkmBOe48SHKEgOU5p84,1337
-p3lib-1.1.109.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-p3lib-1.1.109.dist-info/RECORD,,
+p3lib-1.1.111.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.111.dist-info/METADATA,sha256=gUrAZLEjCDJ4CkOeeIMmnE-iXlLW-07NaLYeL8ZwNFU,1337
+p3lib-1.1.111.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+p3lib-1.1.111.dist-info/RECORD,,