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

ScriptCollection/ScriptCollectionCore.py

@@ -36,7 +36,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.60"
+version = "4.2.62"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -1657,25 +1657,16 @@ class ScriptCollectionCore:
         self.run_program("docker", f"container rm -f {container_name}")
 
     @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])[-1]
-        return result_line
+    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"
+        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
 
     @GeneralUtilities.check_arguments
-    def get_latest_tor_version_of_debian_repository(self, debian_version: str) -> str:
-        package_url: str = f"https://deb.torproject.org/torproject.org/dists/{debian_version}/main/binary-amd64/Packages"
-        headers = {'Cache-Control': 'no-cache'}
-        r = requests.get(package_url, timeout=5, headers=headers)
-        if r.status_code != 200:
-            raise ValueError(f"Checking for latest tor package resulted in HTTP-response-code {r.status_code}.")
-        lines = GeneralUtilities.string_to_lines(GeneralUtilities.bytes_to_string(r.content))
-        version_line_prefix = "Version: "
-        version_content_line = [line for line in lines if line.startswith(version_line_prefix)][1]
-        version_with_overhead = version_content_line[len(version_line_prefix):]
-        tor_version = version_with_overhead.split("~")[0]
-        return tor_version
-
     def run_testcases_for_python_project(self, repository_folder: str):
         self.assert_is_git_repository(repository_folder)
         self.run_program("coverage", "run -m pytest", repository_folder)

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1213,15 +1213,14 @@ class TFCPS_Tools_General:
         image_address for example: "myregistry.example.com/myapp"
         tag for example: "1.0.0"
         """
+        GeneralUtilities.write_message_to_stdout(f"Creating multi-arch artifact {image_address}:{tag}...")
         arch_tags = []
-
         for tar_path, os_name, arch in tar_files:
             arch_tag = f"{image_address}:{tag}-{os_name}-{arch}"
             arch_tags.append(arch_tag)
-
             # Load tar → local image
-            print(f"Loading {tar_path}...")
-            result = self.__sc.run_program_argsasarray("docker",[ "load", "-i", tar_path], capture_output=True)
+            GeneralUtilities.write_message_to_stdout(f"Loading {tar_path}...")
+            result = self.__sc.run_program_argsasarray("docker",[ "load", "-i", tar_path])
             # docker load outputs: "Loaded image: sha256:abc123..." or "Loaded image ID: ..."
             # we need the loaded image ID
             loaded_id = None
@@ -1229,19 +1228,15 @@ class TFCPS_Tools_General:
                 if "Loaded image" in line:
                     loaded_id = line.split(":", 1)[1].strip()
                     break
-
             if not loaded_id:
                 raise RuntimeError(f"Could not determine loaded image from output: \"{result[1]}\"")
-
             # Retag + push
             self.__sc.run_program_argsasarray("docker",[ "tag", loaded_id, arch_tag])
             self.__sc.run_program_argsasarray("docker",[ "push", arch_tag])
-
         # Create multi-arch manifest
         final_tag = f"{image_address}:{tag}"
         self.__sc.run_program_argsasarray("docker", [ "buildx", "imagetools", "create", "--tag", final_tag] + arch_tags)
 
-
     @GeneralUtilities.check_arguments
     def platform_from_filename(self,filename: str) -> Platform:
         match = re.search(r'_([^_]+)\.tar', filename)
@@ -1520,3 +1515,7 @@ class TFCPS_Tools_General:
         source=f"https://raw.githubusercontent.com/anionDev/CommonProjectStructureExamples/refs/heads/main/Other/Reference/RepositoryStructure.mdd"
         target=f"{repository_folder}/Other/Reference/RepositoryStructure.md"
         self.download_file(source,target)   
+
+
+    def update_dependent_oci_images(self,repo:str):
+        pass#TODO update all image-tags in repo/.ScriptCollection/OCIImages/ImageDefinition.csv if possible using the custom defined registries in ~/.ScriptCollection if possible.

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

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

{scriptcollection-4.2.60.dist-info → scriptcollection-4.2.62.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=k9Jxim56NM5dr6wAZrITk-bxZhKKxeXi1gb1zkfcDUo,176930
+ScriptCollection/ScriptCollectionCore.py,sha256=TKeOKBIdL-4wCdt__7tN8xBADf2vHxgudGdnswpxAG8,176461
 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=RCwtEwuZUds-gyHa2qCitWZUgapM3-IZJKF9e5Zwxck,98000
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=3XOc6eYBfmzpEKmmvpH-kCYymzLj3NRXhgUJXzkUOnI,98348
 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.60.dist-info/METADATA,sha256=dQYQcvTQgiDemUjezOsxBCyPOkzYt6DkBe7HSGQUxf4,7690
-scriptcollection-4.2.60.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.60.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.60.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.60.dist-info/RECORD,,
+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,,