ScriptCollection 4.2.69__py3-none-any.whl → 4.2.70__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -1454,6 +1454,18 @@ class GeneralUtilities:
         else:
             raise ValueError(f"Unsupported platform: {system}/{machine}")
 
+    @staticmethod
+    @check_arguments
+    def current_system_is_x64():
+        arch = platform.machine().lower()
+        return arch in ("x86_64", "amd64")
+
+    @staticmethod
+    @check_arguments
+    def current_system_is_arm64():
+        arch = platform.machine().lower()
+        return arch in ("arm", "aarch64")
+    
     @staticmethod
     @check_arguments
     def platform_to_short_str(platform_value: Platform) -> str:
@@ -1523,6 +1535,14 @@ class GeneralUtilities:
             Platform.MacOS_ARM64:   "osx-arm64",
         }
         return mapping[platform_value]
+    @staticmethod
+    @check_arguments
+    def platform_to_go_runtime_identifier(platform_value: Platform) -> str:
+        mapping = {
+            Platform.Linux_AMD64:   "amd64",
+            Platform.Linux_ARM64:   "arm64",
+        }
+        return mapping[platform_value]
 
     @staticmethod
     @check_arguments

ScriptCollection/ScriptCollectionCore.py

@@ -37,7 +37,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.69"
+version = "4.2.70"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -214,6 +214,19 @@ class ScriptCollectionCore:
             GeneralUtilities.assert_not_null(registry_username)
         return (registry_username,registry_password)
 
+    def __get_docker_registry_credentials(self)->list[tuple[str,str,str]]:
+        result=[]
+        credential_file=self.__get_docker_registry_credentials_file()
+        if os.path.isfile(credential_file):
+            lines=GeneralUtilities.read_nonempty_lines_from_file(credential_file)[1:]
+            for line in lines:
+                splitted=line.split(";")
+                registry=splitted[0]
+                username=splitted[1]
+                password=splitted[2]
+                result.append((registry,username,password))
+        return result
+
     def registry_contains_image(self,registry_url:str,image:str,registry_username:str,registry_password:str)->bool:
         """This function assumes that the registry is a custom deployed docker-registry (see https://hub.docker.com/_/registry )"""
         try:
@@ -287,6 +300,16 @@ class ScriptCollectionCore:
         else:
             result = tag in tags 
             return result
+    
+    def login_to_defined_docker_registries(self)->None:
+        registries=self.__get_docker_registry_credentials()
+        if len(registries)==0:
+            self.log.log("No docker registry credentials defined. Skipping docker login.",LogLevel.Debug)
+        else:
+            for registry,username,password in registries:
+                arg=f"login {registry} -u {username} -p {password}"
+                arg_for_log=f"login {registry} -u {username} -p ***"
+                self.run_program("docker",arg,arguments_for_log=arg_for_log,print_live_output=self.log.loglevel==LogLevel.Debug)
         
     @GeneralUtilities.check_arguments
     def python_file_has_errors(self, file: str, working_directory: str, treat_warnings_as_errors: bool = True) -> tuple[bool, list[str]]:
@@ -712,6 +735,7 @@ class ScriptCollectionCore:
         self.git_merge(repository_folder, f"{remote}/{branch}", branch)
         self.git_push_with_retry(repository_folder, remote, branch, branch)
         self.git_checkout(repository_folder, branch)
+        #TODO opeional: checkfor merge conflicts and if there is one merge conflict print a warning
 
     @GeneralUtilities.check_arguments
     def git_merge_abort(self, directory: str) -> None:
@@ -2618,11 +2642,36 @@ TXDX
             encoding
         )
 
+    @GeneralUtilities.check_arguments
+    def get_pip_index_url_arguments_from_local_cache(self)->list[str]:
+        arguments=[]
+        pip_folder=GeneralUtilities.normalize_path(self.get_global_cache_folder()+"/Pip")
+        if os.path.isdir(pip_folder):
+            main_index_file=GeneralUtilities.normalize_path(os.path.join(pip_folder, "MainIndex.txt"))
+            if os.path.isfile(main_index_file):
+                lines=GeneralUtilities.read_nonempty_lines_from_file(main_index_file)
+                url=[line for line in lines if line.startswith("IndexURL: ")][0].split(":")[1].strip()
+                arguments.append("--index-url")
+                arguments.append(url)
+            extra_index_folder=GeneralUtilities.normalize_path(os.path.join(pip_folder, "ExtraIndexURLs"))
+            if os.path.isdir(extra_index_folder):
+                index_files=GeneralUtilities.get_direct_files_of_folder(extra_index_folder)
+                if len(index_files) > 0:
+                    for indexurl_file in index_files:
+                        lines=GeneralUtilities.read_nonempty_lines_from_file(indexurl_file)
+                        url=[line for line in lines if line.startswith("IndexURL: ")][0].split(":")[1].strip()
+                        arguments.append("--extra-index-url")
+                        arguments.append(url)
+        return arguments
+
     @GeneralUtilities.check_arguments
     def install_requirementstxt_file(self, requirements_txt_file: str):
         folder: str = os.path.dirname(requirements_txt_file)
         filename: str = os.path.basename(requirements_txt_file)
-        self.run_program_argsasarray("pip", ["install", "-r", filename], folder)
+        arguments= ["install", "-r", filename]
+        for argument in self.get_pip_index_url_arguments_from_local_cache():
+            arguments.append(argument)
+        self.run_program_argsasarray("pip", arguments, folder,print_live_output=self.log.loglevel==LogLevel.Debug)
 
     @GeneralUtilities.check_arguments
     def ocr_analysis_of_folder(self, folder: str, serviceaddress: str, extensions: list[str], languages: list[str], datafolder: str,base_folder_for_entry: str,ignore_pattern:list[str] ) -> list[str]:  # Returns a list of changed files due to ocr-analysis.
@@ -3272,3 +3321,8 @@ OCR-content:
         commits=self.get_all_commits_in_git_repository(repository_folder, include_all_heads)
         GeneralUtilities.ensure_file_exists(target_file)
         GeneralUtilities.write_lines_to_file(target_file, commits)
+
+
+    @GeneralUtilities.check_arguments
+    def is_runnning_in_container(self) ->bool:
+        return os.environ.get("ISRUNNINGINCONTAINER") == "true"

ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py

@@ -28,10 +28,14 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
         GeneralUtilities.ensure_folder_exists_and_is_empty(app_artifacts_folder)
         for platform in platforms:
             #builder must be created once before with "docker buildx create --use"
-            args = ["buildx","build", "--platform",GeneralUtilities.platform_to_docker_platform_str(platform), "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={self.get_target_environment_type()}", "--build-arg", f"CodeUnitName={codeunitname}", "--build-arg", f"CodeUnitVersion={codeunitversion}", "--build-arg", f"CodeUnitOwnerName={self.tfcps_Tools_General.get_codeunit_owner_name(self.get_codeunit_file())}", "--build-arg", f"CodeUnitOwnerEMailAddress={self.tfcps_Tools_General.get_codeunit_owner_emailaddress(self.get_codeunit_file())}", "--build-arg", f"Platform={GeneralUtilities.platform_to_dash_str(platform)}", "--build-arg", f"DotNetRuntime={GeneralUtilities.platform_to_dotnet_runtime_identifier(platform)}"]
+            args = ["buildx","build", "--platform",GeneralUtilities.platform_to_docker_platform_str(platform), "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={self.get_target_environment_type()}", "--build-arg", f"CodeUnitName={codeunitname}", "--build-arg", f"CodeUnitVersion={codeunitversion}", "--build-arg", f"CodeUnitOwnerName={self.tfcps_Tools_General.get_codeunit_owner_name(self.get_codeunit_file())}", "--build-arg", f"CodeUnitOwnerEMailAddress={self.tfcps_Tools_General.get_codeunit_owner_emailaddress(self.get_codeunit_file())}", "--build-arg", f"Platform={GeneralUtilities.platform_to_dash_str(platform)}", "--build-arg", f"DotNetRuntime={GeneralUtilities.platform_to_dotnet_runtime_identifier(platform)}", "--build-arg", f"PlatformForGoVersion={GeneralUtilities.platform_to_go_runtime_identifier(platform)}"]
             for custom_argument_key, custom_argument_value in custom_arguments.items():
                 args.append("--build-arg")
                 args.append(f"{custom_argument_key}={custom_argument_value}")
+            pip_args=self._protected_sc.get_pip_index_url_arguments_from_local_cache()
+            if len(pip_args)>0:
+                args.append("--build-arg")
+                args.append(f"PipIndexUrlArguments=\"{pip_args}\"")
             args = args+["--tag", f"{codeunitname_lower}:latest", "--tag", f"{codeunitname_lower}:{codeunitversion}", "--file", f"{codeunitname}/Dockerfile"]
             if not self.use_cache():
                 args.append("--no-cache")
@@ -40,13 +44,14 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
             args.append(f"type=docker,dest={target_file}")
             args.append(".")
             self._protected_sc.run_program_argsasarray("docker", args, codeunit_folder, print_errors_as_information=True,print_live_output=self.get_verbosity()==LogLevel.Debug)
+            self._protected_sc.run_program_argsasarray("docker", ["load", "-i", target_file], codeunit_folder, print_errors_as_information=True,print_live_output=self.get_verbosity()==LogLevel.Debug)
+
         self.__generate_sbom_for_docker_image()
         self.copy_source_files_to_output_directory()
 
 
     @GeneralUtilities.check_arguments
     def __generate_sbom_for_docker_image(self) -> None:
-        return #FIXME due to the change of building docker images now using "docker builx build ..." the image is not available locally anymore. for this reason syft can not access the "product:tag"-image anymore to generate a sbom-file. solution: the tar-file must be loaded and tagged.
         codeunitname=self.get_codeunit_name()
         codeunit_folder =self.get_codeunit_folder()
         artifacts_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts", codeunit_folder)

ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py

@@ -1,131 +1,137 @@
-import os
-import shutil
-import re
-import zipfile
-from ...GeneralUtilities import GeneralUtilities
-from ...SCLog import  LogLevel
-from ..TFCPS_CodeUnitSpecific_Base import TFCPS_CodeUnitSpecific_Base,TFCPS_CodeUnitSpecific_Base_CLI
-
-class TFCPS_CodeUnitSpecific_Flutter_Functions(TFCPS_CodeUnitSpecific_Base):
- 
-    def __init__(self,current_file:str,verbosity:LogLevel,targetenvironmenttype:str,use_cache:bool,is_pre_merge:bool):
-        super().__init__(current_file, verbosity,targetenvironmenttype,use_cache,is_pre_merge)
-
-
-    @GeneralUtilities.check_arguments
-    def build(self,package_name:str,targets:list[str]) -> None:
-        codeunit_folder = self.get_codeunit_folder()
-        codeunit_name = os.path.basename(codeunit_folder)
-        src_folder: str = None
-        if package_name is None:
-            src_folder = codeunit_folder
-        else:
-            src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)  # TODO replace packagename
-        artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
-        
-        target_names: dict[str, str] = {
-            "web": "WebApplication",
-            "windows": "Windows",
-            "ios": "IOS",
-            "appbundle": "Android",
-        }
-        for target in targets:
-            self._protected_sc.log.log(f"Build flutter-codeunit {codeunit_name} for target {target_names[target]}...")
-            self._protected_sc.run_with_epew("flutter", f"build {target}", src_folder)
-            if target == "web":
-                web_relase_folder = os.path.join(src_folder, "build/web")
-                web_folder = os.path.join(artifacts_folder, "BuildResult_WebApplication")
-                GeneralUtilities.ensure_directory_does_not_exist(web_folder)
-                GeneralUtilities.ensure_directory_exists(web_folder)
-                GeneralUtilities.copy_content_of_folder(web_relase_folder, web_folder)
-            elif target == "windows":
-                windows_release_folder = os.path.join(src_folder, "build/windows/x64/runner/Release")
-                windows_folder = os.path.join(artifacts_folder, "BuildResult_Windows")
-                GeneralUtilities.ensure_directory_does_not_exist(windows_folder)
-                GeneralUtilities.ensure_directory_exists(windows_folder)
-                GeneralUtilities.copy_content_of_folder(windows_release_folder, windows_folder)
-            elif target == "ios":
-                raise ValueError("building for ios is not implemented yet")
-            elif target == "appbundle":
-                aab_folder = os.path.join(artifacts_folder, "BuildResult_AAB")
-                GeneralUtilities.ensure_directory_does_not_exist(aab_folder)
-                GeneralUtilities.ensure_directory_exists(aab_folder)
-                aab_relase_folder = os.path.join(src_folder, "build/app/outputs/bundle/release")
-                aab_file_original = self._protected_sc.find_file_by_extension(aab_relase_folder, "aab")
-                aab_file = os.path.join(aab_folder, f"{codeunit_name}.aab")
-                shutil.copyfile(aab_file_original, aab_file)
-                
-                bundletool = self.tfcps_Tools_General.ensure_androidappbundletool_is_available(None,self.use_cache())
-                apk_folder = os.path.join(artifacts_folder, "BuildResult_APK")
-                GeneralUtilities.ensure_directory_does_not_exist(apk_folder)
-                GeneralUtilities.ensure_directory_exists(apk_folder)
-                apks_file = f"{apk_folder}/{codeunit_name}.apks"
-                self._protected_sc.run_program("java", f"-jar {bundletool} build-apks --bundle={aab_file} --output={apks_file} --mode=universal", aab_relase_folder)
-                with zipfile.ZipFile(apks_file, "r") as zip_ref:
-                    zip_ref.extract("universal.apk", apk_folder)
-                GeneralUtilities.ensure_file_does_not_exist(apks_file)
-                os.rename(f"{apk_folder}/universal.apk", f"{apk_folder}/{codeunit_name}.apk")
-            else:
-                raise ValueError(f"Not supported target: {target}")
-        self.copy_source_files_to_output_directory()
-
-    @GeneralUtilities.check_arguments
-    def linting(self) -> None:
-        pass#TODO
-
-    @GeneralUtilities.check_arguments
-    def do_common_tasks(self,current_codeunit_version:str )-> None:
-        self.do_common_tasks_base(current_codeunit_version)
-
-    @GeneralUtilities.check_arguments
-    def generate_reference(self) -> None:
-        self.generate_reference_using_docfx()
-
-    
-    @GeneralUtilities.check_arguments
-    def run_testcases(self,package_name:str) -> None:
-        codeunit_folder = self.get_codeunit_folder()
-        repository_folder = GeneralUtilities.resolve_relative_path("..", codeunit_folder)
-        codeunit_name = os.path.basename(codeunit_folder)
-        src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)
-        
-        self._protected_sc.run_with_epew("flutter", "test --coverage", src_folder)
-        test_coverage_folder_relative = "Other/Artifacts/TestCoverage"
-        test_coverage_folder = GeneralUtilities.resolve_relative_path(test_coverage_folder_relative, codeunit_folder)
-        GeneralUtilities.ensure_directory_exists(test_coverage_folder)
-        coverage_file_relative = f"{test_coverage_folder_relative}/TestCoverage.xml"
-        coverage_file = GeneralUtilities.resolve_relative_path(coverage_file_relative, codeunit_folder)
-        self._protected_sc.run_with_epew("lcov_cobertura", f"coverage/lcov.info --base-dir . --excludes test --output ../{coverage_file_relative} --demangle", src_folder)
-
-        # format correctly
-        content = GeneralUtilities.read_text_from_file(coverage_file)
-        content = re.sub('<![^<]+>', '', content)
-        content = re.sub('\\\\', '/', content)
-        content = re.sub('\\ name=\\"lib\\"', '', content)
-        content = re.sub('\\ filename=\\"lib/', f' filename="{package_name}/lib/', content)
-        GeneralUtilities.write_text_to_file(coverage_file, content)
-        self.tfcps_Tools_General.merge_packages(coverage_file, self.get_codeunit_name())
-        self.tfcps_Tools_General.calculate_entire_line_rate(coverage_file)
-        self.run_testcases_common_post_task(repository_folder, codeunit_name, True, self.get_target_environment_type())
-    
-    
-    def get_dependencies(self)->dict[str,set[str]]:
-        return dict[str,set[str]]()#TODO
-    
-    @GeneralUtilities.check_arguments
-    def get_available_versions(self,dependencyname:str)->list[str]:
-        return []#TODO
-    
-    def set_dependency_version(self,name:str,new_version:str)->None:
-        raise ValueError(f"Operation is not implemented.")
-    
-class TFCPS_CodeUnitSpecific_Flutter_CLI:
-
-    @staticmethod
-    @GeneralUtilities.check_arguments
-    def parse(file:str)->TFCPS_CodeUnitSpecific_Flutter_Functions:
-        parser=TFCPS_CodeUnitSpecific_Base_CLI.get_base_parser()
-        #add custom parameter if desired
-        args=parser.parse_args()
-        result:TFCPS_CodeUnitSpecific_Flutter_Functions=TFCPS_CodeUnitSpecific_Flutter_Functions(file,LogLevel(int(args.verbosity)),args.targetenvironmenttype,not args.nocache,args.ispremerge)
-        return result
+import os
+import shutil
+import re
+import zipfile
+from ...GeneralUtilities import GeneralUtilities
+from ...SCLog import  LogLevel
+from ..TFCPS_CodeUnitSpecific_Base import TFCPS_CodeUnitSpecific_Base,TFCPS_CodeUnitSpecific_Base_CLI
+
+class TFCPS_CodeUnitSpecific_Flutter_Functions(TFCPS_CodeUnitSpecific_Base):
+ 
+    def __init__(self,current_file:str,verbosity:LogLevel,targetenvironmenttype:str,use_cache:bool,is_pre_merge:bool):
+        super().__init__(current_file, verbosity,targetenvironmenttype,use_cache,is_pre_merge)
+
+
+    @GeneralUtilities.check_arguments
+    def build(self,package_name:str,targets:list[str]) -> None:
+        codeunit_folder = self.get_codeunit_folder()
+        codeunit_name = os.path.basename(codeunit_folder)
+        src_folder: str = None
+        if package_name is None:
+            src_folder = codeunit_folder
+        else:
+            src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder) # TODO replace packagename
+        artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
+        
+        target_names: dict[str, str] = {
+            "web": "WebApplication",
+            "windows": "Windows",
+            "ios": "IOS",
+            "appbundle": "Android",
+        }
+        for target in targets:
+            self._protected_sc.log.log(f"Build flutter-codeunit {codeunit_name} for target {target_names[target]}...")
+            self._protected_sc.run_with_epew("flutter", f"build {target}", src_folder)
+            if target == "web":
+                web_relase_folder = os.path.join(src_folder, "build/web")
+                web_folder = os.path.join(artifacts_folder, "BuildResult_WebApplication")
+                GeneralUtilities.ensure_directory_does_not_exist(web_folder)
+                GeneralUtilities.ensure_directory_exists(web_folder)
+                GeneralUtilities.copy_content_of_folder(web_relase_folder, web_folder)
+            elif target == "windows":
+                enabled=False
+                if enabled:#TODO move to external because this is not platform indepent
+                    windows_release_folder = os.path.join(src_folder, "build/windows/x64/runner/Release")
+                    windows_folder = os.path.join(artifacts_folder, "BuildResult_Windows")
+                    GeneralUtilities.ensure_directory_does_not_exist(windows_folder)
+                    GeneralUtilities.ensure_directory_exists(windows_folder)
+                    GeneralUtilities.copy_content_of_folder(windows_release_folder, windows_folder)
+            elif target == "ios":
+                enabled=False
+                if enabled:#TODO move to external because this is not platform indepent
+                    raise ValueError("building for ios is not implemented yet")
+            elif target == "appbundle":
+                enabled=False
+                if enabled:#TODO move to external because this is not platform indepent
+                    aab_folder = os.path.join(artifacts_folder, "BuildResult_AAB")
+                    GeneralUtilities.ensure_directory_does_not_exist(aab_folder)
+                    GeneralUtilities.ensure_directory_exists(aab_folder)
+                    aab_relase_folder = os.path.join(src_folder, "build/app/outputs/bundle/release")
+                    aab_file_original = self._protected_sc.find_file_by_extension(aab_relase_folder, "aab")
+                    aab_file = os.path.join(aab_folder, f"{codeunit_name}.aab")
+                    shutil.copyfile(aab_file_original, aab_file)
+                    
+                    bundletool = self.tfcps_Tools_General.ensure_androidappbundletool_is_available(None,self.use_cache())
+                    apk_folder = os.path.join(artifacts_folder, "BuildResult_APK")
+                    GeneralUtilities.ensure_directory_does_not_exist(apk_folder)
+                    GeneralUtilities.ensure_directory_exists(apk_folder)
+                    apks_file = f"{apk_folder}/{codeunit_name}.apks"
+                    self._protected_sc.run_program("java", f"-jar {bundletool} build-apks --bundle={aab_file} --output={apks_file} --mode=universal", aab_relase_folder)
+                    with zipfile.ZipFile(apks_file, "r") as zip_ref:
+                        zip_ref.extract("universal.apk", apk_folder)
+                    GeneralUtilities.ensure_file_does_not_exist(apks_file)
+                    os.rename(f"{apk_folder}/universal.apk", f"{apk_folder}/{codeunit_name}.apk")
+            else:
+                raise ValueError(f"Not supported target: {target}")
+        self.copy_source_files_to_output_directory()
+
+    @GeneralUtilities.check_arguments
+    def linting(self) -> None:
+        pass#TODO
+
+    @GeneralUtilities.check_arguments
+    def do_common_tasks(self,current_codeunit_version:str )-> None:
+        self.do_common_tasks_base(current_codeunit_version)
+
+    @GeneralUtilities.check_arguments
+    def generate_reference(self) -> None:
+        self.generate_reference_using_docfx()
+
+    
+    @GeneralUtilities.check_arguments
+    def run_testcases(self,package_name:str) -> None:
+        codeunit_folder = self.get_codeunit_folder()
+        repository_folder = GeneralUtilities.resolve_relative_path("..", codeunit_folder)
+        codeunit_name = os.path.basename(codeunit_folder)
+        src_folder = GeneralUtilities.resolve_relative_path(package_name, codeunit_folder)
+        
+        self._protected_sc.run_with_epew("flutter", "test --coverage", src_folder)
+        test_coverage_folder_relative = "Other/Artifacts/TestCoverage"
+        test_coverage_folder = GeneralUtilities.resolve_relative_path(test_coverage_folder_relative, codeunit_folder)
+        GeneralUtilities.ensure_directory_exists(test_coverage_folder)
+        coverage_file_relative = f"{test_coverage_folder_relative}/TestCoverage.xml"
+        coverage_file = GeneralUtilities.resolve_relative_path(coverage_file_relative, codeunit_folder)
+        self._protected_sc.run_with_epew("lcov_cobertura", f"coverage/lcov.info --base-dir . --excludes test --output ../{coverage_file_relative} --demangle", src_folder)
+
+        # format correctly
+        content = GeneralUtilities.read_text_from_file(coverage_file)
+        content = re.sub('<![^<]+>', '', content)
+        content = re.sub('\\\\', '/', content)
+        content = re.sub('\\ name=\\"lib\\"', '', content)
+        content = re.sub('\\ filename=\\"lib/', f' filename="{package_name}/lib/', content)
+        GeneralUtilities.write_text_to_file(coverage_file, content)
+        self.tfcps_Tools_General.merge_packages(coverage_file, self.get_codeunit_name())
+        self.tfcps_Tools_General.calculate_entire_line_rate(coverage_file)
+        self.run_testcases_common_post_task(repository_folder, codeunit_name, True, self.get_target_environment_type())
+    
+    
+    def get_dependencies(self)->dict[str,set[str]]:
+        return dict[str,set[str]]()#TODO
+    
+    @GeneralUtilities.check_arguments
+    def get_available_versions(self,dependencyname:str)->list[str]:
+        return []#TODO
+    
+    def set_dependency_version(self,name:str,new_version:str)->None:
+        raise ValueError(f"Operation is not implemented.")
+    
+class TFCPS_CodeUnitSpecific_Flutter_CLI:
+
+    @staticmethod
+    @GeneralUtilities.check_arguments
+    def parse(file:str)->TFCPS_CodeUnitSpecific_Flutter_Functions:
+        parser=TFCPS_CodeUnitSpecific_Base_CLI.get_base_parser()
+        #add custom parameter if desired
+        args=parser.parse_args()
+        result:TFCPS_CodeUnitSpecific_Flutter_Functions=TFCPS_CodeUnitSpecific_Flutter_Functions(file,LogLevel(int(args.verbosity)),args.targetenvironmenttype,not args.nocache,args.ispremerge)
+        return result

ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py

@@ -196,7 +196,7 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
         self._protected_sc.sync_xlf2_files("messages",languages,os.path.join(self.get_codeunit_folder(),"Other","Resources","Translations"))
 
     @GeneralUtilities.check_arguments
-    def translate_safe(self,base_language:str="en")->None:
+    def translate_safe(self,base_language:str="en", throw_if_no_credentials:bool=False)->None:
         """Translates XLF files if a translation service is configured. The translation service can be configured by creating a file at ~/.ScriptCollection/TranslationServiceProperties.txt with the content 'LibreTranslateAPI=your_api_server_url'."""
         translationservice_file:str=self._protected_sc.get_global_cache_folder()+"/TranslationServiceProperties.txt"
         api_server:str=None
@@ -205,8 +205,11 @@ class TFCPS_CodeUnitSpecific_NodeJS_Functions(TFCPS_CodeUnitSpecific_Base):
             for line in lines:
                 if line.startswith("LibreTranslateAPI="):
                     api_server=line.replace("LibreTranslateAPI=","").strip()
-        GeneralUtilities.assert_not_null(api_server,"No translation service configured. Please create a file at ~/.ScriptCollection/TranslationServiceProperties.txt with the content 'LibreTranslateAPI=your_api_server_url' to enable automatic translation of XLF files.")
-        self.translate(api_server,base_language)
+        if api_server is None:
+            if throw_if_no_credentials:
+                raise ValueError("No translation service configured. Please create a file at ~/.ScriptCollection/TranslationServiceProperties.txt with the content 'LibreTranslateAPI=your_api_server_url' to enable automatic translation of XLF files.")
+        else:
+            self.translate(api_server,base_language)
 
     @GeneralUtilities.check_arguments
     def translate(self,api_server:str,base_language:str="en")->None:

ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py

@@ -37,12 +37,14 @@ class TFCPS_CodeUnitSpecific_Python_Functions(TFCPS_CodeUnitSpecific_Base):
         bom_file_json = os.path.join(codeunit_folder, bom_file_relative_json)
         bom_file_xml = os.path.join(codeunit_folder, bom_file_relative_xml)
 
-        GeneralUtilities.ensure_file_exists(bom_file_json)
-        GeneralUtilities.write_text_to_file(bom_file_json, result[1])
-        cyclonedx_exe=self.tfcps_Tools_General.ensure_cyclonedxcli_is_available(not self.use_cache())
-        self._protected_sc.run_program(cyclonedx_exe, f"convert --input-file ./{codeunitname}/{bom_file_relative_json} --input-format json --output-file ./{codeunitname}/{bom_file_relative_xml} --output-format xml", repository_folder)
-        self._protected_sc.format_xml_file(bom_file_xml)
-        GeneralUtilities.ensure_file_does_not_exist(bom_file_json)
+        enabled:bool=False
+        if enabled:#TODO cyclonedx must be available for all platforms in the global sc-cache-folder
+            GeneralUtilities.ensure_file_exists(bom_file_json)
+            GeneralUtilities.write_text_to_file(bom_file_json, result[1])
+            cyclonedx_exe=self.tfcps_Tools_General.ensure_cyclonedxcli_is_available(not self.use_cache())
+            self._protected_sc.run_program(cyclonedx_exe, f"convert --input-file ./{codeunitname}/{bom_file_relative_json} --input-format json --output-file ./{codeunitname}/{bom_file_relative_xml} --output-format xml", repository_folder)
+            self._protected_sc.format_xml_file(bom_file_xml)
+            GeneralUtilities.ensure_file_does_not_exist(bom_file_json)
 
     @GeneralUtilities.check_arguments
     def linting(self) -> None:

ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py

@@ -167,7 +167,7 @@ class TFCPS_CodeUnitSpecific_Base(ABC):
             if not os.path.isfile(combined_file):
                 raise ValueError(f'The mandatory file "{file}" does not exist in the codeunit-folder.')
 
-        if os.path.isfile(os.path.join(codeunit_folder, "Other", "requirements.txt")):
+        if os.path.isfile(os.path.join(codeunit_folder, "requirements.txt")):
             self.install_requirementstxt_for_codeunit()
 
         # check developer
@@ -416,7 +416,7 @@ class TFCPS_CodeUnitSpecific_Base(ABC):
 
     @GeneralUtilities.check_arguments
     def install_requirementstxt_for_codeunit(self):
-        self._protected_sc.install_requirementstxt_file(self.get_codeunit_folder()+"/Other/requirements.txt")
+        self._protected_sc.install_requirementstxt_file(self.get_codeunit_folder()+"/requirements.txt")
 
 class TFCPS_CodeUnitSpecific_Base_CLI():
 

ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py

@@ -79,7 +79,9 @@ class TFCPS_CodeUnit_BuildCodeUnits:
         pre_script_file:str=os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScript.py")
         if  os.path.isfile( pre_script_file):
             self.sc.log.log("Run custom pre-codeunitbuild script...")
-            argument= f"CustomPreCodeUnitBuildScript.py --repository \"{self.repository}\" --targetenvironmenttype {self.target_environment_type} --additionalargumentsfile \"{self.additionalargumentsfile}\" --verbosity {int(self.sc.log.loglevel)}"
+            argument= f"CustomPreCodeUnitBuildScript.py --repository {self.repository} --targetenvironmenttype {self.target_environment_type} --verbosity {int(self.sc.log.loglevel)}"
+            if GeneralUtilities.string_has_content(self.additionalargumentsfile):
+                argument=f"{argument} --additionalargumentsfile {self.additionalargumentsfile}"
             if not self.__use_cache:
                 argument=f"{argument} --nocache"
             self.sc.run_program("python",argument, os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -39,15 +39,33 @@ class TFCPS_Tools_General:
 
     @GeneralUtilities.check_arguments
     def ensure_cyclonedxcli_is_available(self,enforce_update:bool) -> str:
-        local_filename = "cyclonedx-cli"
-        filename_on_github: str
+        local_resource_name="CycloneDXCLI"
+        self.ensure_file_from_github_assets_is_available_with_retry("CycloneDX",  "cyclonedx-cli", local_resource_name,"cyclonedx-linux-arm64",lambda latest_version: "cyclonedx-linux-arm64",enforce_update=enforce_update)
+        self.ensure_file_from_github_assets_is_available_with_retry("CycloneDX",  "cyclonedx-cli", local_resource_name,"cyclonedx-linux-x64",lambda latest_version: "cyclonedx-linux-x64",enforce_update=enforce_update)
+        self.ensure_file_from_github_assets_is_available_with_retry("CycloneDX",  "cyclonedx-cli", local_resource_name,"cyclonedx-win-arm64.exe",lambda latest_version: "cyclonedx-win-arm64.exe",enforce_update=enforce_update)
+        self.ensure_file_from_github_assets_is_available_with_retry("CycloneDX",  "cyclonedx-cli", local_resource_name, "cyclonedx-win-x64.exe",lambda latest_version: "cyclonedx-win-x64.exe",enforce_update=enforce_update)
+        
+        resource_folder =os.path.join( self.__sc.get_global_cache_folder(),"Tools",local_resource_name)
+
+        is_x64:bool=GeneralUtilities.current_system_is_x64()
+        is_arm:bool=GeneralUtilities.current_system_is_arm64()
         if GeneralUtilities.current_system_is_windows():
-            filename_on_github = "cyclonedx-win-x64.exe"
-            local_filename = local_filename+".exe"
+            if is_x64:
+                return os.path.join(resource_folder, "cyclonedx-win-x64.exe")            
+            elif is_arm:
+                return os.path.join(resource_folder, "cyclonedx-win-arm64.exe")
+            else:
+                raise ValueError("Unsupported architecture for cyclonedx-cli on windows.")
+        elif GeneralUtilities.current_system_is_linux():
+            if is_x64:
+                return os.path.join(resource_folder, "cyclonedx-linux-x64")
+            elif is_arm:
+                return os.path.join(resource_folder, "cyclonedx-linux-arm64")
+            else:
+                raise ValueError("Unsupported architecture for cyclonedx-cli on linux.")
         else:
-            filename_on_github = "cyclonedx-linux-x64"
-        return self.ensure_file_from_github_assets_is_available_with_retry("CycloneDX",  "cyclonedx-cli", "CycloneDXCLI",local_filename,lambda latest_version: filename_on_github,enforce_update=enforce_update)
-    
+            raise ValueError("Unsupported operating system for cyclonedx-cli.")
+
     @GeneralUtilities.check_arguments
     def ensure_file_from_github_assets_is_available_with_retry(self, githubuser: str, githubprojectname: str, local_resource_name: str, local_filename: str, get_filename_on_github, amount_of_attempts: int = 5,enforce_update:bool=False) -> str:
         return GeneralUtilities.retry_action(lambda: self.ensure_file_from_github_assets_is_available(githubuser, githubprojectname, local_resource_name, local_filename, get_filename_on_github,enforce_update), amount_of_attempts)
@@ -384,6 +402,7 @@ class TFCPS_Tools_General:
 
     @GeneralUtilities.check_arguments
     def generate_diff_report(self, repository_folder: str, codeunit_name: str, current_version: str) -> None:
+        #TODO refactor this. if new changes (committed or uncommitted) since last git-tag: diff-report from last tag to "now". if no new changes (curren-commit==commit on a vx.y-tag): take diff from last tag to this tag
         self.__sc.assert_is_git_repository(repository_folder)
         codeunit_folder = os.path.join(repository_folder, codeunit_name)
         target_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts/DiffReport", codeunit_folder)
@@ -1182,21 +1201,21 @@ class TFCPS_Tools_General:
         tar_files_with_platforms: list[tuple[str, str, str]] = []
         for tar_file in tar_files:
             filename=os.path.basename(tar_file)#filename looks like "{codeunitname}_v{codeunitversion}_{GeneralUtilities.platform_to_dash_str(platform)}.tar"
-            platform:Platform=self.platform_from_filename(filename)#GeneralUtilities.platform_from_dash_str( filename.split("_")[-1].split(".")[0])
+            platform_of_file:Platform=self.platform_from_filename(filename)#GeneralUtilities.platform_from_dash_str( filename.split("_")[-1].split(".")[0])
             platform_os_in_docker_format :str = None
             platform_arch_in_docker_format :str = None
-            if platform==Platform.Windows_AMD64:
+            if platform_of_file==Platform.Windows_AMD64:
                 raise NotImplementedError("Building docker images for Windows is not implemented yet.")
-            elif platform==Platform.Linux_AMD64:
+            elif platform_of_file==Platform.Linux_AMD64:
                 platform_os_in_docker_format = "linux"
                 platform_arch_in_docker_format = "amd64"
-            elif platform==Platform.Linux_ARM64: 
+            elif platform_of_file==Platform.Linux_ARM64: 
                 platform_os_in_docker_format = "linux"
                 platform_arch_in_docker_format = "arm64"
-            elif platform==Platform.MacOS_ARM64:
+            elif platform_of_file==Platform.MacOS_ARM64:
                 raise NotImplementedError("Building docker images for MacOS is not implemented yet.")
             else:
-                raise ValueError(f"Unsupported platform {platform} extracted from filename {filename}.")
+                raise ValueError(f"Unsupported platform {platform_of_file} extracted from filename {filename}.")
             tar_files_with_platforms.append((tar_file, platform_os_in_docker_format, platform_arch_in_docker_format))
         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")
@@ -1272,14 +1291,14 @@ class TFCPS_Tools_General:
             self.__sc.run_program("docker", f"container rm -f {container_name}", throw_exception_if_exitcode_is_not_zero=False)
         
     @GeneralUtilities.check_arguments
-    def load_docker_image(self, oci_image_artifacts_folder:str,platform:Platform) -> None:
-        for file in GeneralUtilities.get_direct_files_of_folder(oci_image_artifacts_folder):
-            if file.endswith(f"_{GeneralUtilities.platform_to_dash_str(platform)}.tar"):
+    def load_docker_image(self, oci_image_artifacts_folder:str,platform_for_image:Platform) -> None:
+        for file in GeneralUtilities.get_direct_files_of_folder(oci_image_artifacts_folder):            
+            if file.endswith(f"_{GeneralUtilities.platform_to_dash_str(platform_for_image)}.tar"):
                 image_filename = file
-                self.__sc.log.log("Load docker-image...")
+                self.__sc.log.log(f"Load docker-image {image_filename}...")
                 self.__sc.run_program("docker", f"load -i {image_filename}", oci_image_artifacts_folder)
                 return
-        raise ValueError(f"No docker-image found for platform {GeneralUtilities.platform_to_dash_str(platform)} in folder {oci_image_artifacts_folder}.")
+        raise ValueError(f"No docker-image found for platform {GeneralUtilities.platform_to_dash_str(platform_for_image)} in folder {oci_image_artifacts_folder}.")
 
     @GeneralUtilities.check_arguments
     def start_dockerfile_example(self, current_file: str,remove_old_container: bool, remove_volumes_folder: bool, env_file: str) -> None:
@@ -1294,7 +1313,14 @@ class TFCPS_Tools_General:
             self.__sc.log.log(f"Ensure container of {docker_compose_file} do not exist...")
         oci_image_artifacts_folder = GeneralUtilities.resolve_relative_path("../../../../Artifacts/BuildResult_OCIImage", folder_of_current_file)
         self.ensure_containers_are_not_running(container_names_to_remove)
-        self.load_docker_image(oci_image_artifacts_folder,GeneralUtilities.get_current_platform())
+        platform_for_image :Platform=None
+        if GeneralUtilities.current_system_is_x64():
+            platform_for_image=Platform.Linux_AMD64
+        elif GeneralUtilities.current_system_is_arm64():
+            platform_for_image=Platform.Linux_ARM64
+        else:
+            raise ValueError("Unsupported platform for docker-image. Only AMD64 and ARM64 are supported.")
+        self.load_docker_image(oci_image_artifacts_folder,platform_for_image)
         example_name = os.path.basename(folder_of_current_file)
         codeunit_name = os.path.basename(GeneralUtilities.resolve_relative_path("../../../../..", folder_of_current_file))
         if remove_volumes_folder:
@@ -1428,8 +1454,10 @@ class TFCPS_Tools_General:
         for image in self.oci_image_manager.get_used_images_in_repository(repository_folder):
             env_variables[f"image_{image.lower()}"]=self.oci_image_manager.get_registry_address_for_image(repository_folder,image)+":"+self.oci_image_manager.get_tag_for_image(repository_folder,image, True)
         test_services=GeneralUtilities.get_direct_folders_of_folder(os.path.join(repository_folder,"Other","Resources","LocalTestServices"))
-        if 0<len(test_services):
-            self.__sc.log.log("Pull images for local test-services...")
+        if len(test_services)==0:
+            return
+        self.__sc.log.log("Pull images for local test-services...")
+        self.__sc.login_to_defined_docker_registries()
         for test_service_folder in test_services:
             test_service_name=os.path.basename(test_service_folder)
             self.__sc.log.log(f"Pull images for test-service {test_service_name}...")
@@ -1441,7 +1469,8 @@ class TFCPS_Tools_General:
                 lines=lines+[f"{k}={v}"]
             GeneralUtilities.write_lines_to_file(env_variables_file,lines)
             arguments=arguments + " --env-file Parameters.env pull --quiet"
-            self.__sc.run_program_with_retry("docker",arguments,test_service_folder,print_live_output=self.__sc.log.loglevel==LogLevel.Debug)
+            arguments_for_log=arguments
+            self.__sc.run_program_with_retry("docker",arguments,test_service_folder,arguments_for_log=arguments_for_log,print_live_output=self.__sc.log.loglevel==LogLevel.Debug)
 
     def load_deb_control_file_content(self, file: str, codeunitname: str, codeunitversion: str, installedsize: int, maintainername: str, maintaineremail: str, description: str) -> str:
         content = GeneralUtilities.read_text_from_file(file)

{scriptcollection-4.2.69.dist-info → scriptcollection-4.2.70.dist-info}/METADATA

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

{scriptcollection-4.2.69.dist-info → scriptcollection-4.2.70.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ScriptCollection/AnionBuildPlatform.py,sha256=K-PHarX802A0PU8uRu0GNcEZiXujFoXHACe-X9YJsAQ,11711
 ScriptCollection/CertificateUpdater.py,sha256=Pa6eyjQSx7IIvj4PQVMI0IwMs01KQrNSB7Qa-7lRfBs,9375
 ScriptCollection/Executables.py,sha256=qpo0g5peWdlK5uLIUCyLDB9c3JCk0ETbtmOJXZwuHh4,44510
-ScriptCollection/GeneralUtilities.py,sha256=FEjJEfA3riVT7G4sL8bzKPb7w0SN8YjONNWMtiBo_j8,64882
+ScriptCollection/GeneralUtilities.py,sha256=3Fgp0fAXF-rfcohy6k1RsRcMXEVRF15fHl8QJnViKIg,65497
 ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
 ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
 ScriptCollection/ProgramRunnerBase.py,sha256=4A2eQgSg_rRgQcgSi-LYtUlM-uSQEpS7qFWn0tWt4uo,2171
@@ -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=EKRyDmNi9sTTRbbsb6j-MEux0qKMiU_-UyH2xlJK2Vw,177453
+ScriptCollection/ScriptCollectionCore.py,sha256=lVRgY6YA3UPwYXuuFZ9IjlwW-C-_s-ENT3K7s2_5FwU,180421
 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
@@ -22,33 +22,33 @@ ScriptCollection/OCIImages/ConcreteImageHandlers/__init__.py,sha256=47DEQpj8HBSa
 ScriptCollection/Resources/CultureChooser/CultureChooser.js,sha256=5-4pwGDq5j1UnpTZy850ZMoxlM9tYPeu781QpZBtCWM,951
 ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcBEtz2gJXmmM14OwTSFtFVRvw,276
 ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
-ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=xpt-Z_jztEaKgpT1DDSX7wezWX0VKS5LQb7IKAzvi4U,27860
+ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=EMNDgkUem87aH1csz7eoSBBEKkiZMLZqZhnxKSPQWe0,27845
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=MieeAAKm1y58qXp1cCUN5mj5vwpq4Pc1uusUjPQzpvc,8237
-ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=k2uurDeCDdeS0PGu6UJ0BIM2wSZFM0WEHx-1IwQrqO8,15407
+ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=8vVSVXlLxu8xct-5vISOJ7dJlsNnnAcwBzCb59PEY6k,15520
 ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=yqGstRjRfVVGbqrcBgtYStqth2x2SvBb3y2Ht8GsuMQ,6554
 ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv6Bt6hDFhvM,1943
 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=9HhVAcCOHoqR8MG1aYdDWKW66qdsEclcdJkyvSJ9ikA,98448
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=H8qve4dwY6XjLAKrh8jAJohk8DGdtnqa_-frkrME8pU,100769
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=zGTfn2Ytm7Y4W9Aj_R-f3hNMwYpErbF1lZWCPf3Gy8M,11893
+ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=sPO4Gf6oRbGH9QRA3p2nmTAeHtkyYr31ucLbJP09JeY,12139
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
 ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
 ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=W957xFs4YBkWtU8q-JcbN4aWK2Aq8SIM1jePQRRbEkA,31993
 ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=U8oBAOLR2vJpVfc9631Rhb8a04nrnjUMMX-U7pvXjok,7342
+ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=KAjyFyEjpkghsVPskfsHD68k4Z92gRCT_q6BXfikRwE,7660
 ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Go/TFCPS_CodeUnitSpecific_Go.py,sha256=kyx26AnT1-LySFA46wfJ9yZUKYdMWTD0U2XZfSQbuB0,3497
 ScriptCollection/TFCPS/Go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=5xIwcd1cDI1NDrbX5q9MVnnNLdl6PWDrZUO8xyqWjW8,12791
+ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=GQLE6FeR-XNRlLDwionndM-oGLPIbgNhSAx5rc3nnDY,12900
 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/TFCPS_CodeUnitSpecific_Python.py,sha256=9XK7XnbeOnq_4siVoWovogStoKFiZLhGh3C_f2YaznI,13621
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.69.dist-info/METADATA,sha256=ZaxTho_S3qjR3qE6XGSejld39Ve1DD7AMZ1KPtil_0w,7690
-scriptcollection-4.2.69.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.69.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
-scriptcollection-4.2.69.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.69.dist-info/RECORD,,
+scriptcollection-4.2.70.dist-info/METADATA,sha256=ZH8RQwQoInXomGWNzDd0_tMMN1WkGMhU1FfXG2YZ174,7690
+scriptcollection-4.2.70.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.70.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
+scriptcollection-4.2.70.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.70.dist-info/RECORD,,