libsrg 5.2.2__tar.gz → 5.3.0__tar.gz

{libsrg-5.2.2 → libsrg-5.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libsrg
-Version: 5.2.2
+Version: 5.3.0
 Summary: Utility lib logging, statistics, subprocesses
 Author: Steve Goncalo
 Author-email: steven@goncalo.us

{libsrg-5.2.2 → libsrg-5.3.0}/libsrg/Statistics/DiscreteStatsBase.py

@@ -51,7 +51,7 @@ class DiscreteStatsBase(ADStatsBase):
     def count_for(self, value: Any) -> int:
         return self.counter[value]
 
-    def most_common(self, n: int) -> list[tuple[Any, int,str]]:
+    def most_common(self, n: int,time_format:str=None) -> list[tuple[Any, int,str]]:
         if time_format is None:
             time_format="%Y-%m-%d %H:%M:%S %Z"
         mc = self.counter.most_common(n)
@@ -59,10 +59,7 @@ class DiscreteStatsBase(ADStatsBase):
         return mct
 
     def most_common_as_str(self, n: int,time_format:str=None) -> str:
-        if time_format is None:
-            time_format="%Y-%m-%d %H:%M:%S %Z"
-        mc = self.counter.most_common(n)
-        mct = [(key,val,self.last_time[key].astimezone().strftime(time_format)) for key,val in mc]
+        mct = self.most_common(n,time_format)
         return str(mct)
 
     def form_record(self, name: str, count: int, time: float, val: Any) -> DStatsRecord:

{libsrg-5.2.2 → libsrg-5.3.0}/libsrg/Statistics/UnitTests/DiscteteStatsBase_test.py

@@ -53,6 +53,7 @@ class MyTestCase(unittest.TestCase):
         print(ds.counts())
         print(ds.most_common(3))
         print(ds.most_common_as_str(3))
+        print(ds.most_common(3))
 
 
 if __name__ == '__main__':

{libsrg-5.2.2 → libsrg-5.3.0}/libsrg/TKGUI/GuiRequestQueue.py

@@ -7,6 +7,7 @@ import queue
 import random
 import tkinter as tk
 from tkinter import ttk
+from typing import Optional
 
 from libsrg.TKGUI.GuiRequest import GuiRequest
 
@@ -38,7 +39,7 @@ class GuiRequestQueue:
     def register_callback(self, name, func):
         self._callbacks[name] = func
 
-    def ask_gui_new_label(self, msg: str) -> ttk.Label | None:
+    def ask_gui_new_label(self, msg: str) -> Optional[ttk.Label]:
         self.logger.info(f"msg={msg}")
         qreq = GuiRequest(GuiRequest.GET_NEW_LABEL, txt=msg)
         res = self.client_one_request(qreq)

{libsrg-5.2.2 → libsrg-5.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "libsrg"
-version = "5.2.2"
+version = "5.3.0"
 description = "Utility lib logging, statistics, subprocesses"
 authors = ["Steve Goncalo <steven@goncalo.us>"]
 readme = "README.md"