ScriptCollection 3.3.65__py3-none-any.whl → 3.3.67__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -27,7 +27,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
 
-version = "3.3.65"
+version = "3.3.67"
 __version__ = version
 
 
@@ -422,6 +422,7 @@ class ScriptCollectionCore:
     @GeneralUtilities.check_arguments
     def git_checkout(self, directory: str, branch: str) -> None:
         self.run_program_argsasarray("git", ["checkout", branch], directory, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
+        self.run_program_argsasarray("git", ["submodule", "update", "--recursive"], directory, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
 
     @GeneralUtilities.check_arguments
     def git_merge_abort(self, directory: str) -> None:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -101,6 +101,7 @@ class TasksForCommonProjectStructure:
     __sc: ScriptCollectionCore = None
     reference_latest_version_of_xsd_when_generating_xml: bool = True
     validate_developers_of_repository: bool = True
+    dotnet_runsettings_file = "runsettings.xml"
 
     @staticmethod
     @GeneralUtilities.check_arguments
@@ -145,12 +146,13 @@ class TasksForCommonProjectStructure:
     @GeneralUtilities.check_arguments
     def check_testcoverage(self, testcoverage_file_in_cobertura_format: str, repository_folder: str, codeunitname: str):
         root: etree._ElementTree = etree.parse(testcoverage_file_in_cobertura_format)
+        # TODO check if there is at least one package in testcoverage_file_in_cobertura_format
         coverage_in_percent = round(float(str(root.xpath('//coverage/@line-rate')[0]))*100, 2)
         codeunit_file = os.path.join(repository_folder, codeunitname, f"{codeunitname}.codeunit.xml")
         threshold_in_percent = self.__get_testcoverage_threshold_from_codeunit_file(codeunit_file)
         minimalrequiredtestcoverageinpercent = threshold_in_percent
         if (coverage_in_percent < minimalrequiredtestcoverageinpercent):
-            raise ValueError(f"The testcoverage must be {minimalrequiredtestcoverageinpercent}% or more but is {coverage_in_percent}%.")
+            raise ValueError(f"The testcoverage for codeunit {codeunitname} must be {minimalrequiredtestcoverageinpercent}% or more but is {coverage_in_percent}%.")
 
     @GeneralUtilities.check_arguments
     def replace_version_in_python_file(self, file: str, new_version_value: str):
@@ -566,11 +568,11 @@ class TasksForCommonProjectStructure:
         coverage_file_folder = os.path.join(repository_folder, codeunit_name, "Other/Artifacts/TestCoverage")
         working_directory = os.path.join(repository_folder, codeunit_name)
         runsettings_argument = ""
-        runsettings_file = ".runsettings"
+        runsettings_file = self.dotnet_runsettings_file
         if os.path.isfile(os.path.join(working_directory, runsettings_file)):
             runsettings_argument = f"--settings {runsettings_file} "
-        self.__sc.run_program("dotnet-coverage", f"collect dotnet test {runsettings_argument}-c {dotnet_build_configuration} --output-format cobertura " +
-                              "--output Other\\Artifacts\\TestCoverage\\Testcoverage", working_directory, verbosity=verbosity)
+        arg = f"collect dotnet test {runsettings_argument}-c {dotnet_build_configuration} --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)
 
@@ -1006,7 +1008,10 @@ class TasksForCommonProjectStructure:
             for actual_author in actual_authors:
                 if not (actual_author) in expected_authors:
                     actual_author_formatted = f"{actual_author[0]} <{actual_author[1]}>"
-                    raise ValueError(f'Author/Comitter "{actual_author_formatted}" is not in the codeunit-developer-team.')
+                    raise ValueError(f'Author/Comitter "{actual_author_formatted}" is not in the codeunit-developer-team. If {actual_author} is a '
+                                     + 'authorized developer for this codeunit you should consider defining this in the codeunit-file or adapting the name using a '
+                                     + '.mailmap-file (see https://git-scm.com/docs/gitmailmap). The developer-team-check can also be disabled using '
+                                     + 'the property validate_developers_of_repository.')
 
         # TODO implement cycle-check for dependent codeunits
 
@@ -1246,7 +1251,7 @@ class TasksForCommonProjectStructure:
         example_name = os.path.basename(folder)
         GeneralUtilities.write_message_to_stdout(f'Run "{example_name}"-example')
         sc = ScriptCollectionCore()
-        oci_image_artifacts_folder = GeneralUtilities.resolve_relative_path("../../Artifacts/BuildResult_OCIImage", folder)
+        oci_image_artifacts_folder = GeneralUtilities.resolve_relative_path("../../../../Artifacts/BuildResult_OCIImage", folder)
         image_filename = os.path.basename(sc.find_file_by_extension(oci_image_artifacts_folder, "tar"))
         codeunit_name = os.path.basename(GeneralUtilities.resolve_relative_path("../../..", folder))
         codeunit_name_lower = codeunit_name.lower()

{ScriptCollection-3.3.65.dist-info → ScriptCollection-3.3.67.dist-info}/METADATA

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

{ScriptCollection-3.3.65.dist-info → ScriptCollection-3.3.67.dist-info}/RECORD

@@ -3,12 +3,12 @@ ScriptCollection/GeneralUtilities.py,sha256=Blo0Iq-G4zuUL5oUxBTeGFtQ23ndK7dpZPOj
 ScriptCollection/ProgramRunnerBase.py,sha256=2kyOuoM3oFjBfLc9Q5t5RTz7Ya2CjUxFtB1rBBDmnjU,1937
 ScriptCollection/ProgramRunnerEpew.py,sha256=ZiBZVMcsphmo49z2BwUwQYXo2uTKXPu33QW3IxCT46E,6273
 ScriptCollection/ProgramRunnerPopen.py,sha256=HOs1QVnXiQtwXy1_xvH79bWBdd0i-2tUyyLloQBvMto,3023
-ScriptCollection/ScriptCollectionCore.py,sha256=SANV2QlRjAiesegSaM3lte24x3bvPiIhzs5JUcmkI9k,85981
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=ORGqdaEKTjjqYQ-lST1hRCc_JFM9LbUjfW-FXPL5pas,105836
+ScriptCollection/ScriptCollectionCore.py,sha256=AaqVkBaeQIZi6wSoAsY-vLwYaPT045ASo740q53z_e4,86136
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=JUqkBOqA3DlZqCOOODPmprlmHJSRBHzYCQENsBWb10U,106445
 ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.3.65.dist-info/METADATA,sha256=p5nnXTGR0ygZy8teS-qEkwaB7UBv86yv4lKrxCsZ8og,7878
-ScriptCollection-3.3.65.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-ScriptCollection-3.3.65.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
-ScriptCollection-3.3.65.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.3.65.dist-info/RECORD,,
+ScriptCollection-3.3.67.dist-info/METADATA,sha256=V3bnAt7raah9G_QBMI1a5eYg4LOsrHcI-IdP-P7Xr4A,7878
+ScriptCollection-3.3.67.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+ScriptCollection-3.3.67.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
+ScriptCollection-3.3.67.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.3.67.dist-info/RECORD,,