ScriptCollection 4.2.62__py3-none-any.whl → 4.2.64__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -1,4 +1,5 @@
 from datetime import timedelta, datetime
+from functools import cmp_to_key
 import json
 import binascii
 import filecmp
@@ -36,7 +37,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.62"
+version = "4.2.64"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -1657,14 +1658,33 @@ class ScriptCollectionCore:
         self.run_program("docker", f"container rm -f {container_name}")
 
     @GeneralUtilities.check_arguments
-    def get_latest_apt_package_version_in_debian(self, image: str,package) -> str:
-        #docker run --rm -it debian:13.4-slim bash -c "apt update && apt list -a tor"
+    def get_latest_apt_package_version_in_debian(self, image: str,package:str) -> str:
+        #docker run --rm -it debian bash -c "apt update && apt list -a tor"
         output=self.run_with_epew("docker", f"run --rm -it {image} bash -c \"apt --color=false update && apt --color=false list -a tor\"",os.getcwd(),encode_argument_in_base64=True)
         stdout=output[1]
-        version_line=[line.strip() for line in GeneralUtilities.string_to_lines(stdout) if GeneralUtilities.string_has_nonwhitespace_content(line) and line.startswith(package+"/")]
-        GeneralUtilities.assert_condition(len(version_line) ==1, f"No version found for package '{package}' in image '{image}'.")
-        result = version_line[0].split(" ")[1]
-        return result
+        version_lines=[line.strip() for line in GeneralUtilities.string_to_lines(stdout) if GeneralUtilities.string_has_nonwhitespace_content(line) and line.startswith(package+"/")]
+        GeneralUtilities.assert_condition(0<len(version_lines), f"No version found for package '{package}' in image '{image}'.")
+        versions = [version_line.split(" ")[1] for version_line in version_lines]
+        def my_comparer(a, b) -> int:
+            # return:
+            #  -1 → a < b
+            #   0 → a = b
+            #   1 → a > b
+            # dpkg --compare-versions <a> lt <b>  → exit 0 wenn a < b
+            def dpkg_compare(op: str) -> bool:
+                result = self.run_program_argsasarray("docker", [ "run", "--rm",image, "dpkg", "--compare-versions", a, op, b],throw_exception_if_exitcode_is_not_zero=False)
+                GeneralUtilities.assert_condition(result[1]==GeneralUtilities.empty_string)
+                GeneralUtilities.assert_condition(result[2]==GeneralUtilities.empty_string)
+                return result[0] == 0
+
+            if dpkg_compare("lt"): # a < b
+                return -1
+            elif dpkg_compare("gt"): # a > b
+                return 1
+            else:
+                return 0
+        sorted_versions = sorted(versions, key=cmp_to_key(my_comparer))
+        return sorted_versions[-1]
 
     @GeneralUtilities.check_arguments
     def run_testcases_for_python_project(self, repository_folder: str):

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1176,7 +1176,7 @@ class TFCPS_Tools_General:
         applicationimage_folder = os.path.join(artifacts_folder, "BuildResult_OCIImage")
         codeunit_version = self.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml"))
         if remote_image_name is None:
-            remote_image_name = codeunitname
+            remote_image_name = codeunitname.lower()
         tar_files=[f for f in GeneralUtilities.get_direct_files_of_folder(applicationimage_folder) if f.endswith(".tar")]
         target_image_address=f"{registry}/{remote_image_name}"
         tar_files_with_platforms: list[tuple[str, str, str]] = []
@@ -1201,6 +1201,7 @@ class TFCPS_Tools_General:
         self.push_docker_build_artifact_as_multi_arch_artifact(tar_files_with_platforms,target_image_address, "v"+codeunit_version)
         self.push_docker_build_artifact_as_multi_arch_artifact(tar_files_with_platforms,target_image_address, "latest")
         if push_readme:
+            GeneralUtilities.assert_file_exists(os.path.join(codeunit_folder, "ReadMe.md"))
             self.__sc.run_program_with_retry("docker-pushrm", target_image_address, codeunit_folder)
 
     def push_docker_build_artifact_as_multi_arch_artifact(self,tar_files: list[tuple[str, str, str]], image_address: str, tag: str):

{scriptcollection-4.2.62.dist-info → scriptcollection-4.2.64.dist-info}/METADATA

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

{scriptcollection-4.2.62.dist-info → scriptcollection-4.2.64.dist-info}/RECORD

@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
 ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
-ScriptCollection/ScriptCollectionCore.py,sha256=TKeOKBIdL-4wCdt__7tN8xBADf2vHxgudGdnswpxAG8,176461
+ScriptCollection/ScriptCollectionCore.py,sha256=x3BSwJfArWxqVQyeZu3ZXIw5ZjnRWhVdQN_Ct-WpsLU,177450
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=83qDMILwxhH9DbC0sb358Vu8PXEysmJJyap_6gECZqs,1627
 ScriptCollection/OCIImages/OCIImageManager.py,sha256=aBogkSXNDyi8NO11N-s03nuFJEv7PyJ-wjHuYYeZfvs,6662
@@ -30,7 +30,7 @@ ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv
 ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=-Ev9D3bZDlUk2WFQhcmvzQ3FCS97OdsVUd0koAdmpZc,7474
 ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=Ajfy2pLajTuU6UpwItHt4C2a-gLF3gPc4z6BktL3Cio,22163
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=3XOc6eYBfmzpEKmmvpH-kCYymzLj3NRXhgUJXzkUOnI,98348
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=9HhVAcCOHoqR8MG1aYdDWKW66qdsEclcdJkyvSJ9ikA,98448
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=xMuj-GoEwDnmUWbmdF536dNQL7jnTaw9aQ-gcDqUkgQ,11743
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -47,8 +47,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=kL37qJNwH6
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=KFKDdfV9DFHE5n7TI6m1Ra1Qw2JwL_JQjneBfqcRQ_w,13467
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.62.dist-info/METADATA,sha256=qK2TKc3JjC_aXbaHw5oWttsm-s3c1D-jqITQJDNqIsU,7690
-scriptcollection-4.2.62.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.62.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.62.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.62.dist-info/RECORD,,
+scriptcollection-4.2.64.dist-info/METADATA,sha256=UgOzaIjwaC2sYtjl9CVPDh9WvPjVX12aGE0xwk2xlD4,7690
+scriptcollection-4.2.64.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.64.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
+scriptcollection-4.2.64.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.64.dist-info/RECORD,,