ScriptCollection 3.4.4__py3-none-any.whl → 3.4.6__py3-none-any.whl

ScriptCollection/Executables.py

@@ -72,17 +72,6 @@ def CalculateBitcoinBlockHash() -> int:
     return 0
 
 
-def UpdateNugetpackagesInCsharpProject() -> int:
-
-    parser = argparse.ArgumentParser(description="""TODO""")
-    parser.add_argument('csprojfile')
-    args = parser.parse_args()
-    if ScriptCollectionCore().SCUpdateNugetpackagesInCsharpProject(args.csprojfile):
-        return 1
-    else:
-        return 0
-
-
 def Show2FAAsQRCode():
 
     parser = argparse.ArgumentParser(description="""Always when you use 2-factor-authentication you have the problem:

ScriptCollection/ScriptCollectionCore.py

@@ -29,7 +29,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
 
-version = "3.4.4"
+version = "3.4.6"
 __version__ = version
 
 
@@ -879,16 +879,6 @@ class ScriptCollectionCore:
             self.__print_qr_code_by_csv_line(line[0], line[1], line[2], line[3], line[4])
         GeneralUtilities.write_message_to_stdout(separator_line)
 
-    @GeneralUtilities.check_arguments
-    def SCUpdateNugetpackagesInCsharpProject(self, csprojfile: str) -> int:
-        outdated_packages = self.get_nuget_packages_of_csproj_file(csprojfile, True)
-        GeneralUtilities.write_message_to_stdout("The following packages will be updated:")
-        for outdated_package in outdated_packages:
-            GeneralUtilities.write_message_to_stdout(outdated_package)
-            self.update_nuget_package(csprojfile, outdated_package)
-        GeneralUtilities.write_message_to_stdout(f"{len(outdated_packages)} package(s) were updated")
-        return len(outdated_packages) > 0
-
     @GeneralUtilities.check_arguments
     def SCUploadFileToFileHost(self, file: str, host: str) -> int:
         try:
@@ -1118,25 +1108,6 @@ class ScriptCollectionCore:
         GeneralUtilities.ensure_file_does_not_exist(coveragefile)
         os.rename(os.path.join(repository_folder, "coverage.xml"), coveragefile)
 
-    @GeneralUtilities.check_arguments
-    def get_nuget_packages_of_csproj_file(self, csproj_file: str, only_outdated_packages: bool) -> bool:
-        self.run_program("dotnet", f'restore --disable-parallel --force --force-evaluate "{csproj_file}"')
-        if only_outdated_packages:
-            only_outdated_packages_argument = " --outdated"
-        else:
-            only_outdated_packages_argument = ""
-        stdout = self.run_program("dotnet", f'list "{csproj_file}" package{only_outdated_packages_argument}')[1]
-        result = []
-        for line in stdout.splitlines():
-            trimmed_line = line.replace("\t", "").strip()
-            if trimmed_line.startswith(">"):
-                result.append(trimmed_line[2:].split(" ")[0])
-        return result
-
-    @GeneralUtilities.check_arguments
-    def update_nuget_package(self, csproj_file: str, name: str) -> None:
-        self.run_program("dotnet", f'add "{csproj_file}" package {name}')
-
     @GeneralUtilities.check_arguments
     def get_file_permission(self, file: str) -> str:
         """This function returns an usual octet-triple, for example "0700"."""
@@ -1546,7 +1517,7 @@ class ScriptCollectionCore:
                          f'-keyout {name}.key -out {name}.crt', folder)
 
     @GeneralUtilities.check_arguments
-    def generate_certificate(self, folder: str,  domain: str,filename:str, subj_c: str, subj_st: str, subj_l: str, subj_o: str, subj_ou: str,
+    def generate_certificate(self, folder: str,  domain: str, filename: str, subj_c: str, subj_st: str, subj_l: str, subj_o: str, subj_ou: str,
                              days_until_expire: int = None, password: str = None) -> None:
         if days_until_expire is None:
             days_until_expire = 397
@@ -1582,12 +1553,12 @@ DNS                 = {domain}
 """)
 
     @GeneralUtilities.check_arguments
-    def generate_certificate_sign_request(self, folder: str, domain: str,filename:str, subj_c: str, subj_st: str, subj_l: str, subj_o: str, subj_ou: str) -> None:
+    def generate_certificate_sign_request(self, folder: str, domain: str, filename: str, subj_c: str, subj_st: str, subj_l: str, subj_o: str, subj_ou: str) -> None:
         self.run_program("openssl", f'req -new -subj /C={subj_c}/ST={subj_st}/L={subj_l}/O={subj_o}/CN={domain}/OU={subj_ou} ' +
                          f'-key {filename}.key -out {filename}.csr -config {filename}.san.conf', folder)
 
     @GeneralUtilities.check_arguments
-    def sign_certificate(self, folder: str, ca_folder: str, ca_name: str, domain: str,filename:str, days_until_expire: int = None) -> None:
+    def sign_certificate(self, folder: str, ca_folder: str, ca_name: str, domain: str, filename: str, days_until_expire: int = None) -> None:
         if days_until_expire is None:
             days_until_expire = 397
         ca = os.path.join(ca_folder, ca_name)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -272,7 +272,7 @@ class TasksForCommonProjectStructure:
         if gpg_identity is None:
             gpg_identity_argument = ""
         else:
-            pass  # gpg_identity_argument = f" --sign --identity {gpg_identity}"
+            gpg_identity_argument = ""  # f" --sign --identity {gpg_identity}"
             # disabled due to https://blog.pypi.org/posts/2023-05-23-removing-pgp/
 
         if verbosity > 2:
@@ -763,8 +763,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def standardized_tasks_run_testcases_for_dotnet_project(self, runtestcases_file: str, targetenvironmenttype: str, verbosity: int, generate_badges: bool,
-                                                            target_environmenttype_mapping:  dict[str, str], commandline_arguments: list[str]):
-        dotnet_build_configuration: str = target_environmenttype_mapping[targetenvironmenttype]
+                                                            commandline_arguments: list[str]):
         codeunit_name: str = os.path.basename(str(Path(os.path.dirname(runtestcases_file)).parent.parent.absolute()))
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments,  verbosity)
         repository_folder: str = str(Path(os.path.dirname(runtestcases_file)).parent.parent.parent.absolute())
@@ -774,7 +773,7 @@ class TasksForCommonProjectStructure:
         runsettings_file = self.dotnet_runsettings_file
         if os.path.isfile(os.path.join(working_directory, runsettings_file)):
             runsettings_argument = f"--settings {runsettings_file} "
-        arg = f"collect dotnet test {runsettings_argument}-c {dotnet_build_configuration} --output-format cobertura --output Other\\Artifacts\\TestCoverage\\Testcoverage"
+        arg = f"collect dotnet test {runsettings_argument} --no-build --output-format cobertura --output Other\\Artifacts\\TestCoverage\\Testcoverage"
         self.__sc.run_program("dotnet-coverage", arg, working_directory, verbosity=verbosity)
         os.rename(os.path.join(coverage_file_folder,  "Testcoverage.cobertura.xml"), os.path.join(coverage_file_folder,  "TestCoverage.xml"))
         self.run_testcases_common_post_task(repository_folder, codeunit_name, verbosity, generate_badges, targetenvironmenttype, commandline_arguments)
@@ -1642,6 +1641,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def update_dependencies_of_typical_python_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]):
+        # TODO generalize and add option to ignore certain dependencies
         verbosity = self.get_verbosity_from_commandline_arguments(cmd_args, verbosity)
         codeunit_folder = GeneralUtilities.resolve_relative_path("..", os.path.dirname(update_script_file))
         self.__sc.update_dependencies_of_python_in_setupcfg_file(os.path.join(codeunit_folder, "setup.cfg"), verbosity)
@@ -1651,6 +1651,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def update_dependencies_of_typical_dotnet_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]):
+        # TODO generalize and add option to ignore certain dependencies
         verbosity = self.get_verbosity_from_commandline_arguments(cmd_args, verbosity)
         codeunit_folder = GeneralUtilities.resolve_relative_path("..", os.path.dirname(update_script_file))
         codeunit_name = os.path.basename(codeunit_folder)
@@ -1661,7 +1662,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def update_dependencies_of_typical_node_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]):
-        pass  # TODO
+        pass  # TODO generalize and add option to ignore certain dependencies
 
     @GeneralUtilities.check_arguments
     def standardized_tasks_update_version_in_docker_examples(self, file, codeunit_version):
@@ -1970,6 +1971,7 @@ class TasksForCommonProjectStructure:
         additional_arguments_r: str = ""
         additional_arguments_l: str = ""
         additional_arguments_g: str = ""
+        additional_arguments_f: str = ""
         general_argument = f' --overwrite_verbosity={str(verbosity)} --overwrite_targetenvironmenttype={target_environmenttype}'
 
         c_additionalargumentsfile_argument = ""
@@ -1989,15 +1991,17 @@ class TasksForCommonProjectStructure:
             config.read(additional_arguments_file)
             section_name = f"{codeunit_name}_Configuration"
             if config.has_option(section_name, "ArgumentsForCommonTasks"):
-                additional_arguments_c = " "+config.get(section_name, "ArgumentsForCommonTasks")
+                additional_arguments_c = " " + config.get(section_name, "ArgumentsForCommonTasks")
             if config.has_option(section_name, "ArgumentsForBuild"):
-                additional_arguments_b = " "+config.get(section_name, "ArgumentsForBuild")
+                additional_arguments_b = " " + config.get(section_name, "ArgumentsForBuild")
             if config.has_option(section_name, "ArgumentsForRunTestcases"):
-                additional_arguments_r = " "+config.get(section_name, "ArgumentsForRunTestcases")
+                additional_arguments_r = " " + config.get(section_name, "ArgumentsForRunTestcases")
             if config.has_option(section_name, "ArgumentsForLinting"):
-                additional_arguments_l = " "+config.get(section_name, "ArgumentsForLinting")
+                additional_arguments_l = " " + config.get(section_name, "ArgumentsForLinting")
             if config.has_option(section_name, "ArgumentsForGenerateReference"):
-                additional_arguments_g = " "+config.get(section_name, "ArgumentsForGenerateReference")
+                additional_arguments_g = " " + config.get(section_name, "ArgumentsForGenerateReference")
+            if config.has_option(section_name, "ArgumentsForOnFinish"):
+                additional_arguments_f = " " + config.get(section_name, "ArgumentsForOnFinish")
             c_additionalargumentsfile_argument = f' --overwrite_additionalargumentsfile="{additional_arguments_file}"'
 
         GeneralUtilities.write_message_to_stdout('Run "CommonTasks.py"...')
@@ -2037,6 +2041,13 @@ class TasksForCommonProjectStructure:
             raise ValueError(f"GenerateReference.py resulted in exitcode {execution_result[0]}. StdOut: '{execution_result[1]}' StdOut: '{execution_result[2]}'")
         self.verify_artifact_exists(codeunit_folder, dict[str, bool]({"Reference": True}))
 
+        if os.path.isfile(os.path.join(other_folder, "OnBuildingFinished.py")):
+            GeneralUtilities.write_message_to_stdout('Run "OnBuildingFinished.py"...')
+            execution_result = self.__sc.run_program(
+                "python", f"OnBuildingFinished.py{additional_arguments_f}{general_argument}", other_folder, verbosity=verbosity_for_executed_programs, throw_exception_if_exitcode_is_not_zero=False)
+            if execution_result[0] != 0:
+                raise ValueError(f"OnBuildingFinished.py resulted in exitcode {execution_result[0]}. StdOut: '{execution_result[1]}' StdOut: '{execution_result[2]}'")
+
         artifactsinformation_file = os.path.join(artifacts_folder, f"{codeunit_name}.artifactsinformation.xml")
         codeunit_version = self.get_version_of_codeunit(codeunit_file)
         GeneralUtilities.ensure_file_exists(artifactsinformation_file)

{ScriptCollection-3.4.4.dist-info → ScriptCollection-3.4.6.dist-info}/METADATA

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

ScriptCollection-3.4.6.dist-info/RECORD

@@ -0,0 +1,14 @@
+ScriptCollection/Executables.py,sha256=srooVN3-X76sJKG99BxKBV4kuF_GFNq-SuV-zTmNJGw,19002
+ScriptCollection/GeneralUtilities.py,sha256=vZDiW5lWJRCrIZVs1bTCZ-O5slQnM5dv4GcJ-RTMowY,34378
+ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
+ScriptCollection/ProgramRunnerEpew.py,sha256=nIzY4dG6W-xEpkeoTbozwNZtFSIo-bU_W6t6u1AZKtE,6275
+ScriptCollection/ProgramRunnerPopen.py,sha256=HOs1QVnXiQtwXy1_xvH79bWBdd0i-2tUyyLloQBvMto,3023
+ScriptCollection/ScriptCollectionCore.py,sha256=hOkgV6v1XGqiX9TU7_Oqe-UJlYFmFmEwxKwaIybI2JI,94554
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=3ZXzRX7YAzLS8NurwSG0WLfnByVEbmmzx-s8zBME4vs,145487
+ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
+ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ScriptCollection-3.4.6.dist-info/METADATA,sha256=a0a1ZlEkJK2t1C0-CV_bSxnINH0Hjw-AXuakJ6UPfSY,7650
+ScriptCollection-3.4.6.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+ScriptCollection-3.4.6.dist-info/entry_points.txt,sha256=dJKdWcH41owxlKx_khj4P7DItr9lhxWP9JU2Dq8GSsQ,2088
+ScriptCollection-3.4.6.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.4.6.dist-info/RECORD,,

{ScriptCollection-3.4.4.dist-info → ScriptCollection-3.4.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ScriptCollection-3.4.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-ScriptCollection/Executables.py,sha256=AXU8jbBlfosp6lvGS5IsfiR9dbtRjubdniuc_uFqvs8,19324
-ScriptCollection/GeneralUtilities.py,sha256=vZDiW5lWJRCrIZVs1bTCZ-O5slQnM5dv4GcJ-RTMowY,34378
-ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
-ScriptCollection/ProgramRunnerEpew.py,sha256=nIzY4dG6W-xEpkeoTbozwNZtFSIo-bU_W6t6u1AZKtE,6275
-ScriptCollection/ProgramRunnerPopen.py,sha256=HOs1QVnXiQtwXy1_xvH79bWBdd0i-2tUyyLloQBvMto,3023
-ScriptCollection/ScriptCollectionCore.py,sha256=zRtYGEz-Mt54agZsddDTJ33D6UiSlRCZR6Ldw5BpAoY,96159
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=cxoJe_VblieUuimcS43lrE0k3K2_fOES15AE7BIKNNY,144595
-ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
-ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.4.4.dist-info/METADATA,sha256=F8Wpy2yUsUcUsuQ5IH8Bg34HkdkWKQdVT1FbKHV3jDU,7650
-ScriptCollection-3.4.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ScriptCollection-3.4.4.dist-info/entry_points.txt,sha256=dJKdWcH41owxlKx_khj4P7DItr9lhxWP9JU2Dq8GSsQ,2088
-ScriptCollection-3.4.4.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.4.4.dist-info/RECORD,,