ScriptCollection 3.5.119__py3-none-any.whl → 3.5.121__py3-none-any.whl

ScriptCollection/TasksForCommonProjectStructure.py

@@ -340,15 +340,15 @@ class TasksForCommonProjectStructure:
         filename = os.path.basename(wheel_file)
 
         if gpg_identity is None:
-            gpg_identity_argument = ""
+            gpg_identity_argument = GeneralUtilities.empty_string
         else:
-            gpg_identity_argument = ""  # f" --sign --identity {gpg_identity}"
+            gpg_identity_argument = GeneralUtilities.empty_string  # f" --sign --identity {gpg_identity}"
             # disabled due to https://blog.pypi.org/posts/2023-05-23-removing-pgp/
 
         if verbosity > 2:
             verbose_argument = " --verbose"
         else:
-            verbose_argument = ""
+            verbose_argument = GeneralUtilities.empty_string
 
         twine_argument = f"upload{gpg_identity_argument} --repository {repository} --non-interactive {filename} --disable-progress-bar"
         twine_argument = f"{twine_argument} --username __token__ --password {api_key}{verbose_argument}"
@@ -649,8 +649,8 @@ class TasksForCommonProjectStructure:
         filename = os.path.basename(csproj_file)
         GeneralUtilities.write_message_to_stdout(f"Check {filename}...")
         file_content = GeneralUtilities.read_text_from_file(csproj_file)
-        regex = regex.replace("\r", "").replace("\n", "\\n")
-        file_content = file_content.replace("\r", "")
+        regex = regex.replace("\r", GeneralUtilities.empty_string).replace("\n", "\\n")
+        file_content = file_content.replace("\r", GeneralUtilities.empty_string)
         match = re.match(regex, file_content)
         return match is not None
 
@@ -972,13 +972,13 @@ class TasksForCommonProjectStructure:
         diff_target_file = os.path.join(diff_target_folder, "DiffReport.html")
         title = (f'Reference of codeunit {codeunitname} {codeunit_version_identifier} (contained in project <a href="{public_repository_url}">{projectname}</a> {project_version_identifier})')
         if public_repository_url is None:
-            repo_url_html = ""
+            repo_url_html = GeneralUtilities.empty_string
         else:
             repo_url_html = f'<a href="{public_repository_url}/tree/{branch}/{codeunitname}">Source-code</a>'
         if codeunit_has_testcases:
             coverage_report_link = '<a href="./TestCoverageReport/index.html">Test-coverage-report</a><br>'
         else:
-            coverage_report_link = ""
+            coverage_report_link = GeneralUtilities.empty_string
         index_file_for_reference = os.path.join(target_folder, "index.html")
 
         design_file = None
@@ -987,7 +987,7 @@ class TasksForCommonProjectStructure:
             design_file = GeneralUtilities.get_modest_dark_url()
         # TODO make designs from customizable sources be available by a customizable name and outsource this to a class-property because this is duplicated code.
         if design_file is None:
-            design_html = ""
+            design_html = GeneralUtilities.empty_string
         else:
             design_html = f'<link type="text/css" rel="stylesheet" href="{design_file}" />'
 
@@ -1095,7 +1095,7 @@ class TasksForCommonProjectStructure:
             if version_identifier_of_project == "Latest":
                 latest_version_hint = f" (v{project_version})"
             else:
-                latest_version_hint = ""
+                latest_version_hint = GeneralUtilities.empty_string
             reference_versions_html_lines.append(f'    <h2>{version_identifier_of_project}{latest_version_hint}</h2>')
             reference_versions_html_lines.append("    Contained codeunits:<br/>")
             reference_versions_html_lines.append("    <ul>")
@@ -1113,7 +1113,7 @@ class TasksForCommonProjectStructure:
             design_file = GeneralUtilities.get_modest_dark_url()
         # TODO make designs from customizable sources be available by a customizable name and outsource this to a class-property because this is duplicated code.
         if design_file is None:
-            design_html = ""
+            design_html = GeneralUtilities.empty_string
         else:
             design_html = f'<link type="text/css" rel="stylesheet" href="{design_file}" />'
 
@@ -1423,7 +1423,7 @@ class TasksForCommonProjectStructure:
         self.__sc.format_xml_file(sbom_folder+f"/{codeunitname}.{codeunitversion}.sbom.xml")
 
     @GeneralUtilities.check_arguments
-    def push_docker_build_artifact(self, push_artifacts_file: str, registry: str, verbosity: int, push_readme: bool, commandline_arguments: list[str], repository_folder_name: str) -> None:
+    def push_docker_build_artifact(self, push_artifacts_file: str, registry: str, verbosity: int, push_readme: bool, commandline_arguments: list[str], repository_folder_name: str,image_name:str=None) -> None:
         folder_of_this_file = os.path.dirname(push_artifacts_file)
         filename = os.path.basename(push_artifacts_file)
         codeunitname_regex: str = "([a-zA-Z0-9]+)"
@@ -1441,15 +1441,17 @@ class TasksForCommonProjectStructure:
         image_file = sc.find_file_by_extension(applicationimage_folder, "tar")
         image_filename = os.path.basename(image_file)
         codeunit_version = self.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml"))
-        image_tag_name = codeunitname.lower()
-        repo = f"{registry}/{image_tag_name}"
+        if image_name is None:
+            image_name = codeunitname
+        image_name=image_name.lower()
+        repo = f"{registry}/{image_name}"
         image_latest = f"{repo}:latest"
         image_version = f"{repo}:{codeunit_version}"
         GeneralUtilities.write_message_to_stdout("Load image...")
         sc.run_program("docker", f"load --input {image_filename}", applicationimage_folder, verbosity=verbosity)
         GeneralUtilities.write_message_to_stdout("Tag image...")
-        sc.run_program("docker", f"tag {image_tag_name}:{codeunit_version} {image_latest}", verbosity=verbosity)
-        sc.run_program("docker", f"tag {image_tag_name}:{codeunit_version} {image_version}", verbosity=verbosity)
+        sc.run_program("docker", f"tag {image_name}:{codeunit_version} {image_latest}", verbosity=verbosity)
+        sc.run_program("docker", f"tag {image_name}:{codeunit_version} {image_version}", verbosity=verbosity)
         GeneralUtilities.write_message_to_stdout("Push image...")
         sc.run_program("docker", f"push {image_latest}", verbosity=verbosity)
         sc.run_program("docker", f"push {image_version}", verbosity=verbosity)
@@ -1940,7 +1942,7 @@ class TasksForCommonProjectStructure:
     def set_constant(self, codeunit_folder: str, constantname: str, constant_value: str, documentationsummary: str = None, constants_valuefile: str = None) -> None:
         self.assert_is_codeunit_folder(codeunit_folder)
         if documentationsummary is None:
-            documentationsummary = ""
+            documentationsummary = GeneralUtilities.empty_string
         constants_folder = os.path.join(codeunit_folder, "Other", "Resources", "Constants")
         GeneralUtilities.ensure_directory_exists(constants_folder)
         constants_metafile = os.path.join(constants_folder, f"{constantname}.constant.xml")
@@ -2259,7 +2261,7 @@ class TasksForCommonProjectStructure:
         codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
         root: etree._ElementTree = etree.parse(codeunit_file)
         ignoreddependencies = root.xpath('//cps:codeunit/cps:properties/cps:updatesettings/cps:ignoreddependencies/cps:ignoreddependency', namespaces=namespaces)
-        result = [x.text.replace("\\n", "").replace("\\r", "").replace("\n", "").replace("\r", "").strip() for x in ignoreddependencies]
+        result = [x.text.replace("\\n", GeneralUtilities.empty_string).replace("\\r", GeneralUtilities.empty_string).replace("\n", GeneralUtilities.empty_string).replace("\r", GeneralUtilities.empty_string).strip() for x in ignoreddependencies]
         if print_warnings_for_ignored_dependencies and len(result) > 0:
             GeneralUtilities.write_message_to_stderr(f"Warning: Codeunit {codeunit_name} contains the following dependencies which will are ignoed for automatic updates: "+', '.join(result))
         return result
@@ -2346,7 +2348,7 @@ class TasksForCommonProjectStructure:
         sc: ScriptCollectionCore = ScriptCollectionCore()
         workspace_file: str = sc.find_file_by_extension(repository_folder, "code-workspace")
         task_file: str = os.path.join(repository_folder, "Taskfile.yml")
-        lines: list[str] = ["version: '3'", "", "tasks:", ""]
+        lines: list[str] = ["version: '3'", GeneralUtilities.empty_string, "tasks:", GeneralUtilities.empty_string]
         workspace_file_content: str = GeneralUtilities.read_text_from_file(workspace_file)
         jsoncontent = json.loads(workspace_file_content)
         tasks = jsoncontent["tasks"]["tasks"]
@@ -2389,7 +2391,7 @@ class TasksForCommonProjectStructure:
                     aliases = task["aliases"]
                     for alias in aliases:
                         lines.append(f'      - {alias}')
-                lines.append("")
+                lines.append(GeneralUtilities.empty_string)
         GeneralUtilities.write_lines_to_file(task_file, lines)
 
     @GeneralUtilities.check_arguments
@@ -2860,21 +2862,21 @@ class TasksForCommonProjectStructure:
 
             description = self.get_codeunit_description(codeunit_file)
 
-            lines.append(f"")
+            lines.append(GeneralUtilities.empty_string)
             lines.append(f"[{codeunitname}]")
             lines.append(f"note as {codeunitname}Note")
             lines.append(f"  {description}")
             lines.append(f"end note")
             lines.append(f"{codeunitname} .. {codeunitname}Note")
 
-        lines.append(f"")
+        lines.append(GeneralUtilities.empty_string)
         for codeunitname in codeunits:
             codeunit_file: str = os.path.join(repository_folder, codeunitname, f"{codeunitname}.codeunit.xml")
             dependent_codeunits = self.get_dependent_code_units(codeunit_file)
             for dependent_codeunit in dependent_codeunits:
                 lines.append(f"{codeunitname} --> {dependent_codeunit}")
 
-        lines.append(f"")
+        lines.append(GeneralUtilities.empty_string)
         lines.append("@enduml")
 
         GeneralUtilities.write_lines_to_file(target_file, lines)
@@ -3015,15 +3017,15 @@ class TasksForCommonProjectStructure:
         build_folder = os.path.join(other_folder, "Build")
         quality_folder = os.path.join(other_folder, "QualityCheck")
         reference_folder = os.path.join(other_folder, "Reference")
-        additional_arguments_c: str = ""
-        additional_arguments_b: str = ""
-        additional_arguments_r: str = ""
-        additional_arguments_l: str = ""
-        additional_arguments_g: str = ""
-        additional_arguments_f: str = ""
+        additional_arguments_c: str = GeneralUtilities.empty_string
+        additional_arguments_b: str = GeneralUtilities.empty_string
+        additional_arguments_r: str = GeneralUtilities.empty_string
+        additional_arguments_l: str = GeneralUtilities.empty_string
+        additional_arguments_g: str = GeneralUtilities.empty_string
+        additional_arguments_f: str = GeneralUtilities.empty_string
         general_argument = f' --overwrite_verbosity {str(verbosity)} --overwrite_targetenvironmenttype {target_environmenttype}'
 
-        c_additionalargumentsfile_argument = ""
+        c_additionalargumentsfile_argument = GeneralUtilities.empty_string
 
         if is_pre_merge:
             general_argument = general_argument+" --overwrite_is_pre_merge true"

{scriptcollection-3.5.119.dist-info → scriptcollection-3.5.121.dist-info}/METADATA

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

scriptcollection-3.5.121.dist-info/RECORD

@@ -0,0 +1,17 @@
+ScriptCollection/CertificateUpdater.py,sha256=OAxrG21k_o3W3niOOGNSZzUPJlvolOWc1lRB2dMhc3g,9212
+ScriptCollection/Executables.py,sha256=ht-RZFu4g34Sr09b_L0c2QpKcjLWX-wFtKSMDMZYqsw,32266
+ScriptCollection/GeneralUtilities.py,sha256=hqAKRF99uu2RCSBgjX4qjYn3IlImwm6rehRvt8hbNFQ,46407
+ScriptCollection/ImageUpdater.py,sha256=lel1nevTN7fgdoCDE6Xg8YY6XPsZaOQiCIyWXbmVnh0,20882
+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=GEvh0m4OXz_0703XgY-LyAy9RDYg8x1baNZSrWhhu2A,3127
+ScriptCollection/ScriptCollectionCore.py,sha256=eoVmIEoaU_B8sIgaJTN1e7ocurjsLyT2VzxvrsQLyV4,127859
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=4aEuIf89jbgKE4uMYm4DlPDe9Iu1Zujo8wPOzDld09w,234867
+ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scriptcollection-3.5.121.dist-info/METADATA,sha256=guQOcS7sLrfO50qZx1bILbJ5sgUGP2b4IdJb-BG5ZcE,7694
+scriptcollection-3.5.121.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scriptcollection-3.5.121.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.121.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.121.dist-info/RECORD,,

{scriptcollection-3.5.119.dist-info → scriptcollection-3.5.121.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

scriptcollection-3.5.119.dist-info/RECORD

@@ -1,16 +0,0 @@
-ScriptCollection/CertificateUpdater.py,sha256=pJopWFcwaLAEVljtC4O3SVrlpIpoJNUhT1V4mgiqLvE,8970
-ScriptCollection/Executables.py,sha256=ht-RZFu4g34Sr09b_L0c2QpKcjLWX-wFtKSMDMZYqsw,32266
-ScriptCollection/GeneralUtilities.py,sha256=VO4a7xctkjN5dcBXc32gz0x9U07DEagasjvYVKqLmdM,44173
-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=GYnmS97_zQY8uzfrYQnRW9QyBTQgrKMUNfK1QHhcXC4,2384
-ScriptCollection/ScriptCollectionCore.py,sha256=GcAkvv1mcQYyrmhLBRlFu8bCpEbaJPm8cgQrIZXuYa4,131693
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=OfCJsg-FLdde6Duhy4FjBcfwLr-9iLhQAimRa1ZgRyE,234045
-ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.119.dist-info/METADATA,sha256=2nU78EkyhuLoi4sy4hvG9xiD4kGcswnOLWloi5NZVSg,7694
-scriptcollection-3.5.119.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-scriptcollection-3.5.119.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.119.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.119.dist-info/RECORD,,