ScriptCollection 3.5.23__py3-none-any.whl → 3.5.25__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -4,6 +4,7 @@ import json
 import binascii
 import filecmp
 import hashlib
+import multiprocessing
 import time
 from io import BytesIO
 import itertools
@@ -30,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.23"
+version = "3.5.25"
 __version__ = version
 
 
@@ -1072,7 +1073,7 @@ class ScriptCollectionCore:
     @GeneralUtilities.check_arguments
     def get_docker_debian_version(self, image_tag: str) -> str:
         result = ScriptCollectionCore().run_program_argsasarray("docker", ['run', f'debian:{image_tag}', 'bash', '-c', 'apt-get -y update && apt-get -y install lsb-release && lsb_release -cs'])
-        result_line = GeneralUtilities.string_to_lines(result[1])[-2]
+        result_line = GeneralUtilities.string_to_lines(result[1])[-1]
         return result_line
 
     @GeneralUtilities.check_arguments
@@ -1870,3 +1871,17 @@ TXDX
 - [QualityCheck-system](TXDX)
 
 """)
+
+    @GeneralUtilities.check_arguments
+    def run_with_timeout(self, method, timeout_in_seconds: float) -> bool:
+        # Returns true if the method was terminated due to a timeout
+        # Returns false if the method terminates in the given time
+        p = multiprocessing.Process(target=method)
+        p.start()
+        p.join(timeout_in_seconds)
+        if p.is_alive():
+            p.kill()
+            p.join()
+            return True
+        else:
+            return False

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1287,8 +1287,9 @@ class TasksForCommonProjectStructure:
         codeunitname: str = Path(os.path.dirname(build_script_file)).parent.parent.name
         codeunit_folder = GeneralUtilities.resolve_relative_path("../..", str(os.path.dirname(build_script_file)))
         codeunitname_lower = codeunitname.lower()
-        codeunitversion = self.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml"))
-        args = ["image", "build", "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={target_environment_type}", "--build-arg", f"Version={codeunitversion}"]
+        codeunit_file = os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml")
+        codeunitversion = self.get_version_of_codeunit(codeunit_file)
+        args = ["image", "build", "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={target_environment_type}", "--build-arg", f"CodeUnitName={codeunitname}", "--build-arg", f"CodeUnitVersion={codeunitversion}", "--build-arg", f"CodeUnitOwnerName={self.get_codeunit_owner_name(codeunit_file)}", "--build-arg", f"CodeUnitOwnerEMailAddress={self.get_codeunit_owner_emailaddress(codeunit_file)}"]
         for custom_argument_key, custom_argument_value in custom_arguments.items():
             args.append("--build-arg")
             args.append(f"{custom_argument_key}={custom_argument_value}")
@@ -1430,11 +1431,11 @@ class TasksForCommonProjectStructure:
             raise ValueError(f"The folder-name ('{codeunit_name}') is not equal to the codeunit-name ('{codeunit_name_in_codeunit_file}').")
 
         # Check owner-name
-        codeunit_ownername_in_codeunit_file = root.xpath('//cps:codeunit/cps:codeunitownername/text()', namespaces=namespaces)[0]
+        codeunit_ownername_in_codeunit_file = self. get_codeunit_owner_name(codeunit_file)
         GeneralUtilities.assert_condition(GeneralUtilities.string_has_content(codeunit_ownername_in_codeunit_file), "No valid name for codeunitowner given.")
 
         # Check owner-emailaddress
-        codeunit_owneremailaddress_in_codeunit_file = root.xpath('//cps:codeunit/cps:codeunitowneremailaddress/text()', namespaces=namespaces)[0]
+        codeunit_owneremailaddress_in_codeunit_file = self.get_codeunit_owner_emailaddress(codeunit_file)
         GeneralUtilities.assert_condition(GeneralUtilities.string_has_content(codeunit_owneremailaddress_in_codeunit_file), "No valid email-address for codeunitowner given.")
 
         # Check development-state
@@ -1512,6 +1513,22 @@ class TasksForCommonProjectStructure:
         # Generate diff-report
         self.generate_diff_report(repository_folder, codeunit_name, codeunit_version)
 
+    @GeneralUtilities.check_arguments
+    def get_codeunit_owner_name(self, codeunit_file: str) -> None:
+        namespaces = {'cps': 'https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure',
+                      'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
+        root: etree._ElementTree = etree.parse(codeunit_file)
+        result = root.xpath('//cps:codeunit/cps:codeunitownername/text()', namespaces=namespaces)[0]
+        return result
+
+    @GeneralUtilities.check_arguments
+    def get_codeunit_owner_emailaddress(self, codeunit_file: str) -> None:
+        namespaces = {'cps': 'https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure',
+                      'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
+        root: etree._ElementTree = etree.parse(codeunit_file)
+        result = root.xpath('//cps:codeunit/cps:codeunitowneremailaddress/text()', namespaces=namespaces)[0]
+        return result
+
     @GeneralUtilities.check_arguments
     def generate_diff_report(self, repository_folder: str, codeunit_name: str, current_version: str) -> None:
         codeunit_folder = os.path.join(repository_folder, codeunit_name)

{ScriptCollection-3.5.23.dist-info → ScriptCollection-3.5.25.dist-info}/METADATA

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

{ScriptCollection-3.5.23.dist-info → ScriptCollection-3.5.25.dist-info}/RECORD

@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-
 ScriptCollection/ProgramRunnerEpew.py,sha256=C2Rs3YWOWWWJct7XmKphp5CF1tf0j4Fp-ljV2drLTfs,6349
 ScriptCollection/ProgramRunnerPopen.py,sha256=G3LgQUVCfaq7XjBsGzalElH31Hbr0etttGR2_H87YzA,3512
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=vuneqSCSk2_JGarQYnkQaxRoiCVWC4MImq48CQlD3ac,100571
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=KHg2a4VmK43t4rvu5co31eCs-erlx7CAyB-__pXnr_Q,192228
+ScriptCollection/ScriptCollectionCore.py,sha256=QkSVb1Ehol4v-13QRK44aQcGbvWG8O4H0wW5OUm86B0,101078
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=2s_oiUzfcBgKWc33kYphcqDlfdnwpYkn8oCUxKeWmhc,193504
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.23.dist-info/METADATA,sha256=hJ0_J1rkQlKy4E0_dXpH5oqbBlqinQ0zDmtaxdCmMz0,7684
-ScriptCollection-3.5.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ScriptCollection-3.5.23.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
-ScriptCollection-3.5.23.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.23.dist-info/RECORD,,
+ScriptCollection-3.5.25.dist-info/METADATA,sha256=Yj0rW-8rdvEl6z12x6uLz3MIiTt4xOWVwZchFUOQMnM,7684
+ScriptCollection-3.5.25.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ScriptCollection-3.5.25.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
+ScriptCollection-3.5.25.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.25.dist-info/RECORD,,