Merge branch other/next-release into main

anionDev · Sep 29, 2024 · 796655e · 796655e
2 parents c9fc703 + 3193339
commit 796655e
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 40 deletions.
diff --git a/Other/Resources/Changelog/v3.5.17.md b/Other/Resources/Changelog/v3.5.17.md
@@ -0,0 +1,5 @@
+# Release notes
+
+## Changes
+
+- Added developmentstate-check.
diff --git a/SCBuilder/SCBuilder.codeunit.xml b/SCBuilder/SCBuilder.codeunit.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="2.7.10"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/v2.7.10/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd" enabled="false">
+<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="2.9.1"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/v2.9.1/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd" enabled="false">
     <cps:name>SCBuilder</cps:name>
     <cps:version>3.4.51</cps:version>
-    <cps:properties codeunithastestablesourcecode="false" codeunithasupdatabledependencies="false" throwexceptionifcodeunitfilecannotbevalidated="true" description="SCBuilder is a container-image with a build-framework for software-projects."/>
+    <cps:codeunitownername>Marius Göcke</cps:codeunitownername>
+    <cps:codeunitowneremailaddress>[email protected]</cps:codeunitowneremailaddress>
+    <cps:properties codeunithastestablesourcecode="false" codeunithasupdatabledependencies="false" throwexceptionifcodeunitfilecannotbevalidated="true" developmentstate="Maintenance-updates only" description="SCBuilder is a container-image with a build-framework for software-projects."/>
     <cps:dependentcodeunits>
         <cps:dependentcodeunit>ScriptCollection</cps:dependentcodeunit>
     </cps:dependentcodeunits>
+        <cps:pipelinedemands>
+        </cps:pipelinedemands>
+        <cps:updatesettings>
+            <cps:ignoreddependencies>
+            </cps:ignoreddependencies>
+        </cps:updatesettings>
     <cps:developerteam>
         <cps:developer>
             <cps:developername>Marius Göcke</cps:developername>

diff --git a/ScriptCollection/Other/Resources/TestCoverageHistory/2024-09-29_21-54-51_CoverageHistory.xml b/ScriptCollection/Other/Resources/TestCoverageHistory/2024-09-29_21-54-51_CoverageHistory.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<coverage version="1.0" date="2024-09-29_21-54-51" tag="v3.5.17">
+  <assembly name="ScriptCollection">
+    <class name="Executables.py" coveredlines="0" coverablelines="271" totallines="371" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="GeneralUtilities.py" coveredlines="469" coverablelines="736" totallines="873" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ProcessesRunner.py" coveredlines="0" coverablelines="31" totallines="41" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ProgramRunnerBase.py" coveredlines="22" coverablelines="28" totallines="47" 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="23" coverablelines="38" totallines="51" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="RPStream.py" coveredlines="0" coverablelines="32" totallines="42" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="ScriptCollectionCore.py" coveredlines="551" coverablelines="1388" totallines="1865" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="TasksForCommonProjectStructure.py" coveredlines="448" coverablelines="2032" totallines="2632" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+    <class name="UpdateCertificates.py" coveredlines="0" coverablelines="105" totallines="126" coveredbranches="0" totalbranches="0" coveredcodeelements="0" totalcodeelements="0" />
+  </assembly>
+</coverage>
diff --git a/ScriptCollection/ScriptCollection.codeunit.xml b/ScriptCollection/ScriptCollection.codeunit.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="2.9.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/v2.9.0/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd" enabled="true">
-    <cps:name>ScriptCollection</cps:name>
-    <cps:version>3.5.16</cps:version>
-    <cps:codeunitownername>Marius Göcke</cps:codeunitownername>
-    <cps:codeunitowneremailaddress>[email protected]</cps:codeunitowneremailaddress>
-    <cps:properties codeunithastestablesourcecode="true" codeunithasupdatabledependencies="true" throwexceptionifcodeunitfilecannotbevalidated="true" developmentState="Active Development" description="ScriptCollection is the place for reusable scripts.">
-        <cps:testsettings minimalcodecoverageinpercent="30"/>
-        <cps:pipelinedemands>
-        </cps:pipelinedemands>
-        <cps:updatesettings>
-            <cps:ignoreddependencies>        
-            </cps:ignoreddependencies>
-        </cps:updatesettings>        
-    </cps:properties>
-    <cps:dependentcodeunits/>
-    <cps:developerteam>
-        <cps:developer>
-            <cps:developername>Marius Göcke</cps:developername>
-            <cps:developeremailaddress>[email protected]</cps:developeremailaddress>
-        </cps:developer>
-    </cps:developerteam>
-    <!--
-    <cps:demands>
-        <cps:demandstool name="python" version="3.11"/>
-        <cps:demandstool name="pip3" version="22"/>
-        <cps:demandstool name="git" version="2.39"/>
-        <cps:demandstool name="gitversion" version="5"/>
-        <cps:demandstool name="docfx" version="2"/>
-        <cps:demandstool name="reportgenerator" version="5"/>
-    </cps:demands>
-    -->
-</cps:codeunit>
+<?xml version="1.0" encoding="UTF-8" ?>
+<cps:codeunit xmlns:cps="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure" codeunitspecificationversion="2.9.1"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/raw/v2.9.1/Conventions/RepositoryStructure/CommonProjectStructure/codeunit.xsd" enabled="true">
+    <cps:name>ScriptCollection</cps:name>
+    <cps:version>3.5.17</cps:version>
+    <cps:codeunitownername>Marius Göcke</cps:codeunitownername>
+    <cps:codeunitowneremailaddress>[email protected]</cps:codeunitowneremailaddress>
+    <cps:properties codeunithastestablesourcecode="true" codeunithasupdatabledependencies="true" throwexceptionifcodeunitfilecannotbevalidated="true" developmentstate="Active development" description="ScriptCollection is the place for reusable scripts.">
+        <cps:testsettings minimalcodecoverageinpercent="30"/>
+        <cps:pipelinedemands>
+        </cps:pipelinedemands>
+        <cps:updatesettings>
+            <cps:ignoreddependencies>
+            </cps:ignoreddependencies>
+        </cps:updatesettings>
+    </cps:properties>
+    <cps:dependentcodeunits/>
+    <cps:developerteam>
+        <cps:developer>
+            <cps:developername>Marius Göcke</cps:developername>
+            <cps:developeremailaddress>[email protected]</cps:developeremailaddress>
+        </cps:developer>
+    </cps:developerteam>
+    <!--
+    <cps:demands>
+        <cps:demandstool name="python" version="3.11"/>
+        <cps:demandstool name="pip3" version="22"/>
+        <cps:demandstool name="git" version="2.39"/>
+        <cps:demandstool name="gitversion" version="5"/>
+        <cps:demandstool name="docfx" version="2"/>
+        <cps:demandstool name="reportgenerator" version="5"/>
+    </cps:demands>
+    -->
+</cps:codeunit>
diff --git a/ScriptCollection/ScriptCollection/ScriptCollectionCore.py b/ScriptCollection/ScriptCollection/ScriptCollectionCore.py
@@ -30,7 +30,7 @@
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.16"
+version = "3.5.17"
 __version__ = version
 
 

diff --git a/ScriptCollection/ScriptCollection/TasksForCommonProjectStructure.py b/ScriptCollection/ScriptCollection/TasksForCommonProjectStructure.py
@@ -1391,7 +1391,7 @@ def standardized_tasks_do_common_tasks(self, common_tasks_scripts_file: str, cod
 
         # Check codeunit-conformity
         # TODO check if foldername=="<codeunitname>[.codeunit.xml]" == <codeunitname> in file
-        supported_codeunitspecificationversion = "2.9.0"  # should always be the latest version of the ProjectTemplates-repository
+        supported_codeunitspecificationversion = "2.9.1"  # should always be the latest version of the ProjectTemplates-repository
         codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
         if not os.path.isfile(codeunit_file):
             raise ValueError(f'Codeunitfile "{codeunit_file}" does not exist.')
@@ -1428,6 +1428,13 @@ def standardized_tasks_do_common_tasks(self, common_tasks_scripts_file: str, cod
         codeunit_owneremailaddress_in_codeunit_file = root.xpath('//cps:codeunit/cps:codeunitowneremailaddress/text()', namespaces=namespaces)[0]
         GeneralUtilities.assert_condition(GeneralUtilities.string_has_content(codeunit_owneremailaddress_in_codeunit_file), "No valid email-address for codeunitowner given.")
 
+        # Check development-state
+        developmentstate = root.xpath('//cps:properties/@developmentstate', namespaces=namespaces)[0]
+        developmentstate_active = "Active development"
+        developmentstate_maintenance = "Maintenance-updates only"
+        developmentstate_inactive = "Inactive"
+        GeneralUtilities.assert_condition(developmentstate in (developmentstate_active, developmentstate_maintenance, developmentstate_inactive), f"Invalid development-state. Must be '{developmentstate_active}' or '{developmentstate_maintenance}' or '{developmentstate_inactive}' but was '{developmentstate}'.")
+
         # Check for mandatory files
         files = ["Other/Build/Build.py", "Other/QualityCheck/Linting.py", "Other/Reference/GenerateReference.py"]
         if self.codeunit_has_testable_sourcecode(codeunit_file):

diff --git a/ScriptCollection/setup.cfg b/ScriptCollection/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ScriptCollection
-version = 3.5.16
+version = 3.5.17
 author = Marius Göcke
 author_email = [email protected]
 description = The ScriptCollection is the place for reusable scripts.