ScriptCollection 3.3.72__py3-none-any.whl → 3.3.74__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -26,7 +26,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
 
-version = "3.3.72"
+version = "3.3.74"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -27,9 +27,11 @@ class CreateReleaseConfiguration():
     public_repository_url: str
     additional_arguments_file: str = None
     artifacts_which_have_artifacts_to_push: list[str] = None
+    repository_folder_name: str = None
 
     def __init__(self, projectname: str, remotename: str, build_artifacts_target_folder: str, push_artifacts_scripts_folder: str,
-                 verbosity: int, public_repository_url: str, additional_arguments_file: str, artifacts_which_have_artifacts_to_push: list[str]):
+                 verbosity: int, public_repository_url: str, additional_arguments_file: str, artifacts_which_have_artifacts_to_push: list[str],
+                 repository_folder_name: str):
 
         self.projectname = projectname
         self.remotename = remotename
@@ -40,6 +42,7 @@ class CreateReleaseConfiguration():
         self.reference_repository_remote_name = self.remotename
         self.additional_arguments_file = additional_arguments_file
         self.artifacts_which_have_artifacts_to_push = artifacts_which_have_artifacts_to_push
+        self.repository_folder_name = repository_folder_name
 
 
 class CreateReleaseInformationForProjectInCommonProjectFormat:
@@ -70,7 +73,7 @@ class CreateReleaseInformationForProjectInCommonProjectFormat:
             projectname = os.path.basename(self.repository)
         else:
             self.projectname = projectname
-        self.reference_repository = GeneralUtilities.resolve_relative_path(f"../{projectname}Reference", repository)
+        self.reference_repository = f"{repository}Reference"
         self.artifacts_which_have_artifacts_to_push = artifacts_which_have_artifacts_to_push
 
 
@@ -253,10 +256,10 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def push_wheel_build_artifact(self, push_build_artifacts_file, product_name, codeunitname, repository: str,
-                                  apikey: str, gpg_identity: str, verbosity: int, commandline_arguments: list[str]) -> None:
+                                  apikey: str, gpg_identity: str, verbosity: int, commandline_arguments: list[str], repository_folder_name: str) -> None:
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments,  verbosity)
         folder_of_this_file = os.path.dirname(push_build_artifacts_file)
-        repository_folder = GeneralUtilities.resolve_relative_path(f"..{os.path.sep}../Submodules{os.path.sep}{product_name}", folder_of_this_file)
+        repository_folder = GeneralUtilities.resolve_relative_path(f"..{os.path.sep}../Submodules{os.path.sep}{repository_folder_name}", folder_of_this_file)
         wheel_file = self.get_wheel_file(repository_folder, codeunitname)
         self.standardized_tasks_push_wheel_file_to_registry(wheel_file, apikey, repository, gpg_identity, verbosity)
 
@@ -391,26 +394,29 @@ class TasksForCommonProjectStructure:
         repository_folder = os.path.dirname(codeunit_folder)
         codeunit_name = os.path.basename(codeunit_folder)
         codeunit_folder = os.path.join(repository_folder, codeunit_name)
+        codeunit_version = self.get_version_of_codeunit_folder(codeunit_folder)
         message = " does not match the standardized .csproj-file-format."
 
         project_name = codeunit_name
         csproj_file = os.path.join(codeunit_folder, project_name, project_name+".csproj")
-        if not self.__standardized_task_verify_standard_format_for_project_csproj_file(csproj_file):
+        if not self.__standardized_task_verify_standard_format_for_project_csproj_file(csproj_file, codeunit_name, codeunit_version):
             raise ValueError(csproj_file+message)
 
         testproject_name = project_name+"Tests"
         test_csproj_file = os.path.join(codeunit_folder, testproject_name, testproject_name+".csproj")
-        if not self.__standardized_task_verify_standard_format_for_test_csproj_file(test_csproj_file):
+        if not self.__standardized_task_verify_standard_format_for_test_csproj_file(test_csproj_file, codeunit_name, codeunit_version):
             raise ValueError(test_csproj_file+message)
 
-    def __standardized_task_verify_standard_format_for_project_csproj_file(self, csproj_file: str) -> bool:
-        regex = """^<Project Sdk=\\"Microsoft\\.NET\\.Sdk\\">
+    def __standardized_task_verify_standard_format_for_project_csproj_file(self, csproj_file: str, codeunit_name: str, codeunit_version: str) -> bool:
+        codeunit_name_regex = re.escape(codeunit_name)
+        codeunit_version_regex = re.escape(codeunit_version)
+        regex = f"""^<Project Sdk=\\"Microsoft\\.NET\\.Sdk\\">
 \\W*<PropertyGroup>
 \\W*	<TargetFramework>([^<]+)<\\/TargetFramework>
 \\W*	<Authors>([^<]+)<\\/Authors>
-\\W*	<Version>\\d+\\.\\d+\\.\\d+<\\/Version>
-\\W*	<AssemblyVersion>\\d+\\.\\d+\\.\\d+<\\/AssemblyVersion>
-\\W*	<FileVersion>\\d+\\.\\d+\\.\\d+<\\/FileVersion>
+\\W*	<Version>{codeunit_version_regex}<\\/Version>
+\\W*	<AssemblyVersion>{codeunit_version_regex}<\\/AssemblyVersion>
+\\W*	<FileVersion>{codeunit_version_regex}<\\/FileVersion>
 \\W*	<SelfContained>false<\\/SelfContained>
 \\W*	<IsPackable>false<\\/IsPackable>
 \\W*	<PreserveCompilationContext>false<\\/PreserveCompilationContext>
@@ -418,7 +424,7 @@ class TasksForCommonProjectStructure:
 \\W*	<Copyright>([^<]+)<\\/Copyright>
 \\W*	<Description>([^<]+)<\\/Description>
 \\W*	<PackageProjectUrl>https:\\/\\/([^<]+)<\\/PackageProjectUrl>
-\\W*	<RepositoryUrl>https:\\/\\/([^<]+)<\\/RepositoryUrl>
+\\W*	<RepositoryUrl>https:\\/\\/([^<]+)\\.git<\\/RepositoryUrl>
 \\W*	<RootNamespace>([^<]+)\\.Core<\\/RootNamespace>
 \\W*	<ProduceReferenceAssembly>false<\\/ProduceReferenceAssembly>
 \\W*	<Nullable>disable<\\/Nullable>
@@ -434,9 +440,9 @@ class TasksForCommonProjectStructure:
 \\W*	<Prefer32Bit>false<\\/Prefer32Bit>
 \\W*	<NoWarn>([^<]+)<\\/NoWarn>
 \\W*	<WarningsAsErrors>([^<]+)<\\/WarningsAsErrors>
-\\W*	<ErrorLog>\\.\\.\\\\Other\\\\Resources\\\\([^<]+)\\.sarif<\\/ErrorLog>
+\\W*	<ErrorLog>\\.\\.\\\\Other\\\\Resources\\\\{codeunit_name_regex}\\.sarif<\\/ErrorLog>
 \\W*	<OutputType>([^<]+)<\\/OutputType>
-\\W*	<DocumentationFile>\\.\\.\\\\Other\\\\Artifacts\\\\MetaInformation\\\\([^<]+)\\.xml<\\/DocumentationFile>
+\\W*	<DocumentationFile>\\.\\.\\\\Other\\\\Artifacts\\\\MetaInformation\\\\{codeunit_name_regex}\\.xml<\\/DocumentationFile>
 \\W*	(<ApplicationIcon>([^<]+)<\\/ApplicationIcon>)?
 \\W*	(<StartupObject>([^<]+)<\\/StartupObject>)?
 \\W*<\\/PropertyGroup>
@@ -468,22 +474,24 @@ class TasksForCommonProjectStructure:
 \\W*$"""
         return self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file)
 
-    def __standardized_task_verify_standard_format_for_test_csproj_file(self, csproj_file: str) -> bool:
-        regex = """^<Project Sdk=\\"Microsoft\\.NET\\.Sdk\\">
+    def __standardized_task_verify_standard_format_for_test_csproj_file(self, csproj_file: str, codeunit_name: str, codeunit_version: str) -> bool:
+        codeunit_name_regex = re.escape(codeunit_name)
+        codeunit_version_regex = re.escape(codeunit_version)
+        regex = f"""^<Project Sdk=\\"Microsoft\\.NET\\.Sdk\\">
 \\W*<PropertyGroup>
 \\W*	<TargetFramework>([^<]+)<\\/TargetFramework>
 \\W*	<Authors>([^<]+)<\\/Authors>
-\\W*	<Version>\\d+\\.\\d+\\.\\d+<\\/Version>
-\\W*	<AssemblyVersion>\\d+\\.\\d+\\.\\d+<\\/AssemblyVersion>
-\\W*	<FileVersion>\\d+\\.\\d+\\.\\d+<\\/FileVersion>
+\\W*	<Version>{codeunit_version_regex}<\\/Version>
+\\W*	<AssemblyVersion>{codeunit_version_regex}<\\/AssemblyVersion>
+\\W*	<FileVersion>{codeunit_version_regex}<\\/FileVersion>
 \\W*	<SelfContained>false<\\/SelfContained>
 \\W*	<IsPackable>false<\\/IsPackable>
 \\W*	<PreserveCompilationContext>false<\\/PreserveCompilationContext>
 \\W*	<GenerateRuntimeConfigurationFiles>true<\\/GenerateRuntimeConfigurationFiles>
 \\W*	<Copyright>([^<]+)<\\/Copyright>
-\\W*	<Description>([^<]+)<\\/Description>
+\\W*	<Description>{codeunit_name_regex}Tests\\ is\\ the\\ test-project\\ for\\ {codeunit_name_regex}\\.<\\/Description>
 \\W*	<PackageProjectUrl>https:\\/\\/([^<]+)<\\/PackageProjectUrl>
-\\W*	<RepositoryUrl>https:\\/\\/([^<]+)</RepositoryUrl>
+\\W*	<RepositoryUrl>https:\\/\\/([^<]+)\\.git</RepositoryUrl>
 \\W*	<RootNamespace>([^<]+)\\.Tests<\\/RootNamespace>
 \\W*	<ProduceReferenceAssembly>false<\\/ProduceReferenceAssembly>
 \\W*	<Nullable>disable<\\/Nullable>
@@ -499,7 +507,7 @@ class TasksForCommonProjectStructure:
 \\W*	<Prefer32Bit>false<\\/Prefer32Bit>
 \\W*	<NoWarn>([^<]+)<\\/NoWarn>
 \\W*	<WarningsAsErrors>([^<]+)<\\/WarningsAsErrors>
-\\W*	<ErrorLog>\\.\\.\\\\Other\\\\Resources\\\\([^<]+)\\.sarif<\\/ErrorLog>
+\\W*	<ErrorLog>\\.\\.\\\\Other\\\\Resources\\\\{codeunit_name_regex}Tests\\.sarif<\\/ErrorLog>
 \\W*	<OutputType>Library<\\/OutputType>
 \\W*<\\/PropertyGroup>
 \\W*<PropertyGroup Condition=\\\"'\\$\\(Configuration\\)'=='Development'\\\">
@@ -523,9 +531,9 @@ class TasksForCommonProjectStructure:
 \\W*	<DefineConstants>Productive<\\/DefineConstants>
 \\W*	<ErrorReport>none<\\/ErrorReport>
 \\W*<\\/PropertyGroup>
-\\W*<ItemGroup>
-\\W*.+
-\\W*<\\/ItemGroup>
+\\W*(<ItemGroup>
+\\W*.*
+\\W*<\\/ItemGroup>)*
 \\W*<\\/Project>
 \\W*$"""
         return self.__standardized_task_verify_standard_format_for_csproj_files(regex, csproj_file)
@@ -891,10 +899,10 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.write_text_to_file(reference_index_file, reference_index_file_content)
 
     @GeneralUtilities.check_arguments
-    def push_nuget_build_artifact(self, push_script_file: str, codeunitname: str, registry_address: str, api_key: str):
+    def push_nuget_build_artifact(self, push_script_file: str, codeunitname: str, registry_address: str, api_key: str, repository_folder_name: str):
         # when pusing to "default public" nuget-server then use registry_address: "nuget.org"
         build_artifact_folder = GeneralUtilities.resolve_relative_path(
-            f"../../Submodules/{codeunitname}/{codeunitname}/Other/Artifacts/BuildResult_NuGet", os.path.dirname(push_script_file))
+            f"../../Submodules/{repository_folder_name}/{codeunitname}/Other/Artifacts/BuildResult_NuGet", os.path.dirname(push_script_file))
         self.__sc.push_nuget_build_artifact(self.__sc.find_file_by_extension(build_artifact_folder, "nupkg"),
                                             registry_address, api_key)
 
@@ -937,7 +945,7 @@ class TasksForCommonProjectStructure:
 
         self.__sc.git_checkout(build_repository_folder, createRelease_configuration.build_repository_branch)
 
-        repository_folder = GeneralUtilities.resolve_relative_path(f"Submodules{os.path.sep}{createRelease_configuration.projectname}", build_repository_folder)
+        repository_folder = GeneralUtilities.resolve_relative_path(f"Submodules{os.path.sep}{createRelease_configuration.repository_folder_name}", build_repository_folder)
         mergeInformation = MergeToStableBranchInformationForProjectInCommonProjectFormat(repository_folder,
                                                                                          createRelease_configuration.additional_arguments_file,
                                                                                          createRelease_configuration.artifacts_folder)
@@ -1055,10 +1063,10 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def push_docker_build_artifact(self, push_artifacts_file: str, registry: str, product_name: str, codeunitname: str,
-                                   verbosity: int, push_readme: bool, commandline_arguments: list[str]):
+                                   verbosity: int, push_readme: bool, commandline_arguments: list[str], repository_folder_name: str):
         folder_of_this_file = os.path.dirname(push_artifacts_file)
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
-        repository_folder = GeneralUtilities.resolve_relative_path(f"..{os.path.sep}..{os.path.sep}Submodules{os.path.sep}{product_name}", folder_of_this_file)
+        repository_folder = GeneralUtilities.resolve_relative_path(f"..{os.path.sep}..{os.path.sep}Submodules{os.path.sep}{repository_folder_name}", folder_of_this_file)
         codeunit_folder = os.path.join(repository_folder, codeunitname)
         artifacts_folder = self.get_artifacts_folder(repository_folder, codeunitname)
         applicationimage_folder = os.path.join(artifacts_folder, "BuildResult_OCIImage")
@@ -1146,14 +1154,14 @@ class TasksForCommonProjectStructure:
             raise ValueError('An empty array as argument for the "commandline_arguments"-parameter is not valid.')
         commandline_arguments = commandline_arguments[1:]
         repository_folder: str = str(Path(os.path.dirname(common_tasks_scripts_file)).parent.parent.absolute())
-        codeunitname: str = str(os.path.basename(Path(os.path.dirname(common_tasks_scripts_file)).parent.absolute()))
+        codeunit_name: str = str(os.path.basename(Path(os.path.dirname(common_tasks_scripts_file)).parent.absolute()))
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         project_version = self.get_version_of_project(repository_folder)
-        codeunit_folder = os.path.join(repository_folder, codeunitname)
+        codeunit_folder = os.path.join(repository_folder, codeunit_name)
 
         # Check codeunit-conformity
         # TODO check if foldername=="<codeunitname>[.codeunit.xml]"==codeunitname in file
-        codeunitfile = os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml")
+        codeunitfile = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
         if not os.path.isfile(codeunitfile):
             raise Exception(f'Codeunitfile "{codeunitfile}" does not exist.')
         # TODO implement usage of self.reference_latest_version_of_xsd_when_generating_xml
@@ -1169,6 +1177,11 @@ class TasksForCommonProjectStructure:
         schemaLocation = root.xpath('//cps:codeunit/@xsi:schemaLocation', namespaces=namespaces)[0]
         xmlschema.validate(codeunitfile, schemaLocation)
 
+        # Check codeunit-name
+        codeunit_name_in_codeunit_file = root.xpath('//cps:codeunit/cps:name/text()', namespaces=namespaces)[0]
+        if codeunit_name != codeunit_name_in_codeunit_file:
+            raise ValueError(f"The folder-name ('{codeunit_name}') is not equal to the codeunit-name ('{codeunit_name_in_codeunit_file}').")
+
         # Check developer
         if self.validate_developers_of_repository:
             expected_authors: list[tuple[str, str]] = []
@@ -1177,7 +1190,7 @@ class TasksForCommonProjectStructure:
                 author_name = expected_author.xpath('./cps:developername/text()', namespaces=namespaces)[0]
                 author_emailaddress = expected_author.xpath('./cps:developeremailaddress/text()', namespaces=namespaces)[0]
                 expected_authors.append((author_name, author_emailaddress))
-            actual_authors: list[tuple[str, str]] = self.__sc.get_all_authors_and_committers_of_repository(repository_folder, codeunitname, verbosity)
+            actual_authors: list[tuple[str, str]] = self.__sc.get_all_authors_and_committers_of_repository(repository_folder, codeunit_name, verbosity)
             for actual_author in actual_authors:
                 if not (actual_author) in expected_authors:
                     actual_author_formatted = f"{actual_author[0]} <{actual_author[1]}>"
@@ -1197,8 +1210,8 @@ class TasksForCommonProjectStructure:
         if assume_dependent_codeunits_are_already_built:
             pass  # TODO do basic checks to verify dependent codeunits are really there and raise exception if not
         else:
-            self.build_dependent_code_units(repository_folder, codeunitname, verbosity, target_environmenttype, additional_arguments_file)
-        self.copy_artifacts_from_dependent_code_units(repository_folder, codeunitname)
+            self.build_dependent_code_units(repository_folder, codeunit_name, verbosity, target_environmenttype, additional_arguments_file)
+        self.copy_artifacts_from_dependent_code_units(repository_folder, codeunit_name)
 
         # Update codeunit-version
         self.update_version_of_codeunit(common_tasks_scripts_file, version)
@@ -1341,16 +1354,15 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.write_text_to_file(os.path.join(constants_valuefile_folder, constants_valuefile_name), constant_value)
 
     @GeneralUtilities.check_arguments
-    def generate_openapi_file(self, buildscript_file: str, runtime: str, swagger_document_name: str,
-                              verbosity: int, commandline_arguments: list[str]) -> None:
+    def generate_openapi_file(self, buildscript_file: str, runtime: str, verbosity: int, commandline_arguments: list[str],
+                              swagger_document_name: str = "APISpecification") -> None:
         codeunitname = os.path.basename(str(Path(os.path.dirname(buildscript_file)).parent.parent.absolute()))
         repository_folder = str(Path(os.path.dirname(buildscript_file)).parent.parent.parent.absolute())
         artifacts_folder = os.path.join(repository_folder, codeunitname, "Other", "Artifacts")
         GeneralUtilities.ensure_directory_exists(os.path.join(artifacts_folder, "APISpecification"))
-        verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
+        verbosity = self.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         version = self.get_version_of_codeunit_folder(os.path.join(repository_folder, codeunitname))
-        self.__sc.run_program("swagger",
-                              f"tofile --output APISpecification\\{codeunitname}.v{version}.api.json" +
+        self.__sc.run_program("swagger", f"tofile --output APISpecification\\{codeunitname}.v{version}.api.json" +
                               f" BuildResult_DotNet_{runtime}\\{codeunitname}.dll {swagger_document_name}",
                               artifacts_folder, verbosity=verbosity)
 

{ScriptCollection-3.3.72.dist-info → ScriptCollection-3.3.74.dist-info}/METADATA

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

{ScriptCollection-3.3.72.dist-info → ScriptCollection-3.3.74.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=XtEa3jDCSviyL6JPdOttS7fz_yB7i5ysNSPmfu49vWc,86796
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=fd7VjtbvncnPdaJV1g7bZDVspV0mo7-uoaN9GwU9wjo,117347
+ScriptCollection/ScriptCollectionCore.py,sha256=STnbdeyyo8d-hc5qqkX4qGWDit6AK-fp7rVGtZSJw2k,86796
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=yn2reLjaNyMtV6f37dwTBXuIYnO37Zfu059EdstsOMM,118534
 ScriptCollection/UpdateCertificates.py,sha256=Go-JJK-YTi7aBB1phlLxypa8GHkmFHBEPB0_TT9G-bw,7918
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.3.72.dist-info/METADATA,sha256=7bawbXJYTHtf8g36GXbGDcSAuqLn8Bp87qPxqAA3UJU,7878
-ScriptCollection-3.3.72.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ScriptCollection-3.3.72.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
-ScriptCollection-3.3.72.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.3.72.dist-info/RECORD,,
+ScriptCollection-3.3.74.dist-info/METADATA,sha256=73D1BAzKZnroByQrqwadaow6mrTeyX1vGsYIZQt7vLk,7878
+ScriptCollection-3.3.74.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ScriptCollection-3.3.74.dist-info/entry_points.txt,sha256=VIuxVCOpX38lSJUwRRENBNgcGKTIBxQyrCfbJVRHP8g,1968
+ScriptCollection-3.3.74.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.3.74.dist-info/RECORD,,