ScriptCollection 3.5.161__py3-none-any.whl → 3.5.162__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -7,6 +7,7 @@ import re
 import os
 import subprocess
 import shutil
+import time
 import urllib
 import stat
 import secrets
@@ -369,7 +370,7 @@ class GeneralUtilities:
     @check_arguments
     def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_milliseconds: bool = False) -> str:
         if datetime_object.tzinfo is None:
-            datetime_object=datetime_object.replace(tzinfo=timezone.utc)#assume utc when no timezone is given
+            datetime_object = datetime_object.replace(tzinfo=timezone.utc)  # assume utc when no timezone is given
         pattern: str = None
         if add_milliseconds:
             pattern = "%Y-%m-%dT%H:%M:%S.%f%z"
@@ -635,8 +636,8 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def read_lines_from_file(file: str, encoding="utf-8") -> list[str]:
-        content=GeneralUtilities.read_text_from_file(file, encoding)
-        if len(content)==0:
+        content = GeneralUtilities.read_text_from_file(file, encoding)
+        if len(content) == 0:
             return []
         else:
             return [GeneralUtilities.strip_new_line_character(line) for line in content.split('\n')]
@@ -869,7 +870,7 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def get_time_based_logfilename(name: str = "Log") -> str:
-        d=GeneralUtilities.get_now()
+        d = GeneralUtilities.get_now()
         return f"{name}_{GeneralUtilities.datetime_to_string_for_logfile_name(d)}"
 
     @staticmethod
@@ -1040,7 +1041,7 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def certificate_is_expired(certificate_file: str) -> bool:
-        return GeneralUtilities.get_certificate_expiry_date(certificate_file) <GeneralUtilities.get_now()
+        return GeneralUtilities.get_certificate_expiry_date(certificate_file) < GeneralUtilities.get_now()
 
     @staticmethod
     @check_arguments
@@ -1109,14 +1110,14 @@ class GeneralUtilities:
                 result = action()
                 return result
             except Exception:
+                time.sleep(1.1)
                 amount_of_fails = amount_of_fails+1
                 GeneralUtilities.assert_condition(not (amount_of_attempts < amount_of_fails))
-                if amount_of_fails == amount_of_attempts:
-                    message = f"Action failed {amount_of_attempts} times."
-                    if action_name is not None:
-                        message = f"{message} Name of action: {action_name}"
-                    GeneralUtilities.write_message_to_stderr(message)
-                    raise
+                message = f"Action failed {amount_of_attempts} times."
+                if action_name is not None:
+                    message = f"{message} Name of action: {action_name}"
+                GeneralUtilities.write_message_to_stderr(message)
+                raise
         return None
 
     @staticmethod

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.161"
+version = "3.5.162"
 __version__ = version
 
 
@@ -2047,7 +2047,7 @@ DNS                 = {domain}
                 if not (package_name in ignored_dependencies):
                     self.log.log(f"Update package {package_name}...", LogLevel.Debug)
                     time.sleep(1.1)  # attempt to prevent rate-limit
-                    self.run_program("dotnet", f"add {csproj_filename} package {package_name}", folder, print_errors_as_information=True)
+                    self.run_program_with_retry("dotnet", f"add {csproj_filename} package {package_name}", folder, print_errors_as_information=True)
 
     @GeneralUtilities.check_arguments
     def create_deb_package(self, toolname: str, binary_folder: str, control_file_content: str, deb_output_folder: str, verbosity: int, permission_of_executable_file_as_octet_triple: int) -> None:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -261,7 +261,7 @@ class TasksForCommonProjectStructure:
         codeunit_name = os.path.basename(codeunit_folder)
         src_folder: str = None
         if package_name is None:
-            src_folder=codeunit_folder
+            src_folder = codeunit_folder
         else:
             src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)  # TODO replace packagename
         artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
@@ -1478,13 +1478,13 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.write_message_to_stdout("Load image...")
         self.__sc.run_program("docker", f"load --input {image_filename}", applicationimage_folder, verbosity=verbosity)
         GeneralUtilities.write_message_to_stdout("Tag image...")
-        self.__sc.run_program("docker", f"tag {local_image_name}:{codeunit_version} {remote_image_latest}", verbosity=verbosity)
-        self.__sc.run_program("docker", f"tag {local_image_name}:{codeunit_version} {remote_image_version}", verbosity=verbosity)
+        self.__sc.run_program_with_retry("docker", f"tag {local_image_name}:{codeunit_version} {remote_image_latest}", verbosity=verbosity)
+        self.__sc.run_program_with_retry("docker", f"tag {local_image_name}:{codeunit_version} {remote_image_version}", verbosity=verbosity)
         GeneralUtilities.write_message_to_stdout("Push image...")
-        self.__sc.run_program("docker", f"push {remote_image_latest}", verbosity=verbosity)
-        self.__sc.run_program("docker", f"push {remote_image_version}", verbosity=verbosity)
+        self.__sc.run_program_with_retry("docker", f"push {remote_image_latest}", verbosity=verbosity)
+        self.__sc.run_program_with_retry("docker", f"push {remote_image_version}", verbosity=verbosity)
         if push_readme:
-            self.__sc.run_program("docker-pushrm", f"{remote_repo}", codeunit_folder, verbosity=verbosity)
+            self.__sc.run_program_with_retry("docker-pushrm", f"{remote_repo}", codeunit_folder, verbosity=verbosity)
 
     @GeneralUtilities.check_arguments
     def get_dependent_code_units(self, codeunit_file: str) -> list[str]:

{scriptcollection-3.5.161.dist-info → scriptcollection-3.5.162.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.161
+Version: 3.5.162
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -35,7 +35,7 @@ Requires-Dist: psutil>=7.0.0
 Requires-Dist: pycdlib>=1.14.0
 Requires-Dist: Pygments>=2.19.2
 Requires-Dist: pylint>=3.3.8
-Requires-Dist: pyOpenSSL>=25.2.0
+Requires-Dist: pyOpenSSL>=25.3.0
 Requires-Dist: PyPDF>=6.0.0
 Requires-Dist: pytest>=8.4.2
 Requires-Dist: PyYAML>=6.0.2

{scriptcollection-3.5.161.dist-info → scriptcollection-3.5.162.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
 ScriptCollection/Executables.py,sha256=xWXG2lKx82y697vFDC3EsG1K3FqyX1Fo0bnfLSXIY1A,38282
-ScriptCollection/GeneralUtilities.py,sha256=3pjPt7jPK73MgdQ9CAANDrEWn2WI6vpjLkkvZI8JKww,48752
+ScriptCollection/GeneralUtilities.py,sha256=DKOgfpqKyxEvtoo_ncxGivtrqrQyF8J2S9vYBnSdaS8,48731
 ScriptCollection/ImageUpdater.py,sha256=qTe3yoqzQJY7LZdXBbjbWvrsSQaeHy1VwmOxaRzU2ig,29305
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=rMdrEzBKQZBdObPJ9nZ5XCEXRoIFqPh8fAoiX6ZOVuw,4493
-ScriptCollection/ScriptCollectionCore.py,sha256=DPbTCj2wGkX2kLuv8pIg8qMvJwtgOJAPm4b7LSq7Q0A,141731
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=TfRpYvL8svDkKHcX2aoj1v3R8nGGxwnoEXqm3OcLK_Q,250485
+ScriptCollection/ScriptCollectionCore.py,sha256=7axjJZ3kMYVeO4dvOINbIf-W9CRZs2SGIWn1_hRjyPI,141742
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=bVq2XIEz1Z8bXOW1WJIVN2YW9vMCcR2FCTuqEyzFG_I,250542
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.161.dist-info/METADATA,sha256=5rzT3Iy0_wucfGtf_PtLCH4X6pu1fno5r08dROgfBjw,7689
-scriptcollection-3.5.161.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.161.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
-scriptcollection-3.5.161.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.161.dist-info/RECORD,,
+scriptcollection-3.5.162.dist-info/METADATA,sha256=lvHNFsWWWMeMxh4qeIH8mLPAGhiMlXBnuwPHaq_cv5o,7689
+scriptcollection-3.5.162.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.162.dist-info/entry_points.txt,sha256=EBRDrnGDURysHNyK0Z0fPCnL7uCCO_Mxc6WYJ47KxAI,4234
+scriptcollection-3.5.162.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.162.dist-info/RECORD,,