Merge branch other/next-release into main

Other/Resources/Changelog/v3.3.43.md

@@ -0,0 +1,5 @@
+# Release notes
+
+## Changes
+
+- Fixes in `TasksForCommonProjectStructure`.

ScriptCollection/Other/Resources/TestCoverageHistory/2023-01-11_22-48-13_CoverageHistory.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<coverage version="1.0" date="2023-01-11_22-48-13" tag="v3.3.43">
+  <assembly name="ScriptCollection">
+    <class name="Executables.py" coveredlines="0" coverablelines="233" totallines="336" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="GeneralUtilities.py" coveredlines="417" coverablelines="666" totallines="793" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="Hardening.py" coveredlines="0" coverablelines="32" totallines="59" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ProgramRunnerBase.py" coveredlines="22" coverablelines="28" totallines="42" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ProgramRunnerEpew.py" coveredlines="40" coverablelines="103" totallines="122" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ProgramRunnerPopen.py" coveredlines="25" coverablelines="37" totallines="50" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ScriptCollectionCore.py" coveredlines="490" coverablelines="1090" totallines="1440" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="TasksForCommonProjectStructure.py" coveredlines="251" coverablelines="986" totallines="1336" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="UpdateCertificates.py" coveredlines="0" coverablelines="105" totallines="128" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+  </assembly>
+</coverage>

ScriptCollection/ScriptCollection.codeunit.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="1.1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/main/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd">
-    <cps:name>ScriptCollection</cps:name>
-    <cps:version>3.3.42</cps:version>
-    <cps:minimalcodecoverageinpercent>30</cps:minimalcodecoverageinpercent>
-    <cps:dependentcodeunits></cps:dependentcodeunits>
+<?xml version="1.0" encoding="UTF-8" ?>
+<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/main/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd">
+    <cps:name>ScriptCollection</cps:name>
+    <cps:version>3.3.43</cps:version>
+    <cps:minimalcodecoverageinpercent>30</cps:minimalcodecoverageinpercent>
+    <cps:dependentcodeunits></cps:dependentcodeunits>
 </cps:codeunit>

ScriptCollection/ScriptCollection/ScriptCollectionCore.py

@@ -25,7 +25,7 @@
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
 
-version = "3.3.42"
+version = "3.3.43"
 __version__ = version
 
 

ScriptCollection/ScriptCollection/TasksForCommonProjectStructure.py

@@ -54,13 +54,14 @@ class CreateReleaseInformationForProjectInCommonProjectFormat:
     export_target: str = None
 
     def __init__(self, repository: str, artifacts_folder: str, projectname: str, public_repository_url: str,
-                 target_branch_name: str, additional_arguments_file: str, export_target: str):
+                 target_branch_name: str, additional_arguments_file: str, export_target: str, push_artifacts_scripts_folder: str):
         self.repository = repository
         self.public_repository_url = public_repository_url
         self.target_branch_name = target_branch_name
         self.artifacts_folder = artifacts_folder
         self.additional_arguments_file = additional_arguments_file
         self.export_target = export_target
+        self.push_artifacts_scripts_folder = push_artifacts_scripts_folder
         if projectname is None:
             projectname = os.path.basename(self.repository)
         else:
@@ -627,8 +628,6 @@ def __standardized_tasks_release_buildartifact(self, information: CreateReleaseI
         # This function is intended to be called directly after __standardized_tasks_merge_to_stable_branch
         project_version = self.__sc.get_semver_version_from_gitversion(information.repository)
         target_folder_base = os.path.join(information.artifacts_folder, information.projectname, project_version)
-        if os.path.isdir(target_folder_base):
-            raise ValueError(f"The folder '{target_folder_base}' already exists.")
         GeneralUtilities.ensure_directory_exists(target_folder_base)
 
         self.build_codeunits(information.repository, information.verbosity, information.target_environmenttype_for_productive,
@@ -767,7 +766,8 @@ def merge_to_stable_branch(self, create_release_file: str, createRelease_configu
                                                                                            createRelease_configuration.public_repository_url,
                                                                                            mergeInformation.targetbranch,
                                                                                            mergeInformation.additional_arguments_file,
-                                                                                           mergeInformation.export_target)
+                                                                                           mergeInformation.export_target,
+                                                                                           createRelease_configuration.push_artifacts_scripts_folder)
         createReleaseInformation.verbosity = createRelease_configuration.verbosity
         self.__standardized_tasks_release_buildartifact(createReleaseInformation)
 

ScriptCollection/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ScriptCollection
-version = 3.3.42
+version = 3.3.43
 author = Marius Göcke
 author_email = [email protected]
 description = The ScriptCollection is the place for reusable scripts.