ScriptCollection 3.5.153__py3-none-any.whl → 3.5.155__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -368,11 +368,10 @@ class GeneralUtilities:
     @staticmethod
     @check_arguments
     def datetime_to_string_for_logfile_entry(datetime_object: datetime, add_timezone_info_to_log: bool = True) -> str:
-        base_pattern: str = "%Y-%m-%d %H:%M:%S"
         if add_timezone_info_to_log:
-            return datetime_object.strftime(f'{base_pattern} %z')
+            return datetime_object.isoformat()
         else:
-            return datetime_object.strftime(base_pattern)
+            return datetime_object.strftime("%Y-%m-%d %H:%M:%S")
 
     @staticmethod
     @check_arguments

ScriptCollection/ScriptCollectionCore.py

@@ -35,7 +35,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.153"
+version = "3.5.155"
 __version__ = version
 
 
@@ -2356,8 +2356,10 @@ TXDX
         GeneralUtilities.write_text_to_file(file, ET.tostring(element, encoding="unicode"), encoding)
 
     @GeneralUtilities.check_arguments
-    def install_requirementstxt_file(self, requirements_txt_file: str, folder: str, verbosity: int):
-        self.run_program_argsasarray("pip", ["install", "-r", requirements_txt_file], folder, verbosity=verbosity)
+    def install_requirementstxt_file(self, requirements_txt_file: str, verbosity: int):
+        folder:str=os.path.dirname(requirements_txt_file)
+        filename:str=os.path.basename(requirements_txt_file)
+        self.run_program_argsasarray("pip", ["install", "-r", filename], folder, verbosity=verbosity)
 
     @GeneralUtilities.check_arguments
     def ocr_analysis_of_folder(self, folder: str, serviceaddress: str, extensions: list[str], languages: list[str]) -> list[str]:  # Returns a list of changed files due to ocr-analysis.
@@ -2450,15 +2452,15 @@ OCR-content:
                 new_lines.append(line)
         GeneralUtilities.write_lines_to_file(target_file, new_lines)
 
-    def do_and_log_task(self,name_of_task:str,task):
+    def do_and_log_task(self, name_of_task: str, task):
         try:
-            self.log.log(f"Start {name_of_task}", LogLevel.Information)
-            result= task()
+            self.log.log(f"Start action \"{name_of_task}\".", LogLevel.Information)
+            result = task()
             if result is None:
-                result=0
+                result = 0
             return result
         except Exception as e:
-            self.log.log_exception(f"Error while {name_of_task}.", e, traceback)
+            self.log.log_exception(f"Error while running action \"{name_of_task}\".", e, traceback)
             return 1
         finally:
-            self.log.log(f"Finished {name_of_task}.", LogLevel.Information)
+            self.log.log(f"Finished action \"{name_of_task}\".", LogLevel.Information)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1376,8 +1376,8 @@ class TasksForCommonProjectStructure:
         return project_version
 
     @GeneralUtilities.check_arguments
-    def standardized_tasks_build_for_docker_project(self, build_script_file: str, target_environment_type: str, verbosity: int, commandline_arguments: list[str]) -> None:
-        self.standardized_tasks_build_for_docker_project_with_additional_build_arguments(build_script_file, target_environment_type, verbosity, commandline_arguments, dict[str, str]())
+    def standardized_tasks_build_for_docker_project(self, build_script_file: str, target_environment_type: str, verbosity: int, commandline_arguments: list[str], custom_arguments: dict[str, str] = None) -> None:
+        self.standardized_tasks_build_for_docker_project_with_additional_build_arguments(build_script_file, target_environment_type, verbosity, commandline_arguments, custom_arguments)
         self.generate_sbom_for_docker_image(build_script_file, verbosity, commandline_arguments)
 
     @GeneralUtilities.check_arguments
@@ -1416,9 +1416,10 @@ class TasksForCommonProjectStructure:
         codeunit_file = os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml")
         codeunitversion = self.get_version_of_codeunit(codeunit_file)
         args = ["image", "build", "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={target_environment_type}", "--build-arg", f"CodeUnitName={codeunitname}", "--build-arg", f"CodeUnitVersion={codeunitversion}", "--build-arg", f"CodeUnitOwnerName={self.get_codeunit_owner_name(codeunit_file)}", "--build-arg", f"CodeUnitOwnerEMailAddress={self.get_codeunit_owner_emailaddress(codeunit_file)}"]
-        for custom_argument_key, custom_argument_value in custom_arguments.items():
-            args.append("--build-arg")
-            args.append(f"{custom_argument_key}={custom_argument_value}")
+        if custom_arguments is not None:
+            for custom_argument_key, custom_argument_value in custom_arguments.items():
+                args.append("--build-arg")
+                args.append(f"{custom_argument_key}={custom_argument_value}")
         args = args+["--tag", f"{codeunitname_lower}:latest", "--tag", f"{codeunitname_lower}:{codeunitversion}", "--file", f"{codeunitname}/Dockerfile"]
         if not use_cache:
             args.append("--no-cache")
@@ -2676,7 +2677,7 @@ class TasksForCommonProjectStructure:
         sorted_codeunits = [codeunit for codeunit in sorted_codeunits if codeunit in codeunits]
         project_version = self.get_version_of_project(repository_folder)
 
-        message = f"Build codeunits in product {repository_name}... (Started: {GeneralUtilities.datetime_to_string(now_begin)})"
+        message = f"Build codeunits in product {repository_name}... (Started: {GeneralUtilities.datetime_to_string_for_logfile_entry(now_begin)})"
         if note is not None:
             message = f"{message} ({note})"
         GeneralUtilities.write_message_to_stdout(message)
@@ -2719,7 +2720,7 @@ class TasksForCommonProjectStructure:
                 shutil.move(archive_file, target_folder)
 
         now_end: datetime = datetime.now()
-        message2 = f"Finished build codeunits in product {repository_name}. (Finished: {GeneralUtilities.datetime_to_string(now_end)})"
+        message2 = f"Finished build codeunits in product {repository_name}. (Finished: {GeneralUtilities.datetime_to_string_for_logfile_entry(now_end)})"
         if note is not None:
             message2 = f"{message2} ({note})"
         GeneralUtilities.write_message_to_stdout(message2)

{scriptcollection-3.5.153.dist-info → scriptcollection-3.5.155.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.153
+Version: 3.5.155
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-3.5.153.dist-info → scriptcollection-3.5.155.dist-info}/RECORD

@@ -1,17 +1,17 @@
 ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
 ScriptCollection/Executables.py,sha256=BojgHGBYn5QqpsdIgn8r8raxb8bE_BUyb-fZ_rCEN0A,37050
-ScriptCollection/GeneralUtilities.py,sha256=t8xp0s10V-MrWYQQiMx0ae3LLTM8G2wPyyWXqeIteXQ,48023
+ScriptCollection/GeneralUtilities.py,sha256=E1Jjgf_Vdc8G4KhCSg7FnyP6R3jRNPpsUiZnjSQ-2zk,47962
 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=49NlLEmK_f-icw_uEPq9U3qv-oBTMRcIqSg3jaO8VsA,4360
-ScriptCollection/ScriptCollectionCore.py,sha256=XzMdqcTRG9UAV3uyZjvWYsa-hbMbSoT3Axb3OqIRMig,139119
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=glEoCoC9FotsG4jRu5-LgvvTB_qFntKlXT1kGhgy3s4,247136
+ScriptCollection/ScriptCollectionCore.py,sha256=yLDK7zuBIW0K3y9tK53Bjt2zjEkLgEyKnDq4v0eo78k,139260
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=BGmhrkHPbSxo9CQYo1URbERROiDnJSEt5V-b1emX-wQ,247266
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.153.dist-info/METADATA,sha256=JvDOgE8UQCgopI-CORbEa3VeFodQY-YJgXORPqjoUfc,7689
-scriptcollection-3.5.153.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-3.5.153.dist-info/entry_points.txt,sha256=yZlEK0r5Ie7xrSLdlWZgFqzLZiIctsIAUJvDCgrYBRo,4193
-scriptcollection-3.5.153.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.153.dist-info/RECORD,,
+scriptcollection-3.5.155.dist-info/METADATA,sha256=Y0a-2LHPG_-uCQpwJgXZjMu5rJczHCqu_IXRpLhguxU,7689
+scriptcollection-3.5.155.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-3.5.155.dist-info/entry_points.txt,sha256=yZlEK0r5Ie7xrSLdlWZgFqzLZiIctsIAUJvDCgrYBRo,4193
+scriptcollection-3.5.155.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.155.dist-info/RECORD,,