ScriptCollection 4.0.59__py3-none-any.whl → 4.0.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.0.59"
+version = "4.0.62"
 __version__ = version
 
 

ScriptCollection/TFCPS/TFCPS_MergeToStable.py

@@ -83,6 +83,7 @@ class TFCPS_MergeToStable:
       
 
         self.sc.log.log("Release artifacts...")
+        repository:str=self.createRelease_configuration.repository
         project_version:str=self.tFCPS_Tools_General.get_version_of_project(repository)
         for codeunit in self.tFCPS_Tools_General.get_codeunits(self.createRelease_configuration.repository):
             self.sc.git_checkout(self.createRelease_configuration.repository, self.createRelease_configuration.source_branch, True,True)
@@ -107,7 +108,6 @@ class TFCPS_MergeToStable:
             # update codeunit-reference
             self.sc.log.log(f"Release artifacts of codeunit {codeunit}...")
             reference_folder:str=os.path.join(reference_repo,"ReferenceContent")
-            repository:str=self.createRelease_configuration.repository
             projectname:str=os.path.basename(repository)
             public_repository_url:str=self.createRelease_configuration.common_remote_url
             main_branch_name:str=self.createRelease_configuration.source_branch

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -791,7 +791,7 @@ class TFCPS_Tools_General:
     @GeneralUtilities.check_arguments
     def do_npm_install(self, package_json_folder: str, npm_force: bool,use_cache:bool) -> None:
         target_folder:str=os.path.join(package_json_folder,"node_modules")
-        update:bool=not os.path.isdir(target_folder) or  GeneralUtilities.folder_is_empty(target_folder) or not use_cache
+        update:bool=not os.path.isdir(target_folder) or GeneralUtilities.folder_is_empty(target_folder) or not use_cache
         if update:
             self.__sc.log.log("Do npm-install...")
             argument1 = "install"
@@ -1263,6 +1263,10 @@ class TFCPS_Tools_General:
         docker_project_name = f"{codeunit_name}_{example_name}".lower()
         self.__sc.log.log("Stop docker-container...")
         self.__sc.run_program("docker", f"compose --project-name {docker_project_name} down", folder)
+        if  remove_old_container:
+            pass#TODO
+        if  remove_volumes_folder:
+            pass#TODO
 
     @GeneralUtilities.check_arguments
     def update_submodule(self, repository_folder: str, submodule_name: str, local_branch: str = "main", remote_branch: str = "main", remote: str = "origin"):
@@ -1280,3 +1284,60 @@ class TFCPS_Tools_General:
 
 - Updated geo-ip-database.
 """)
+
+    def set_latest_version_for_clone_repository_as_resource(self,repository_folder:str, resourcename: str, github_link: str, branch: str = "main"):
+
+        resrepo_commit_id_folder: str = os.path.join(repository_folder, "Other", "Resources", f"{resourcename}Version")
+        resrepo_commit_id_file: str = os.path.join(resrepo_commit_id_folder, f"{resourcename}Version.txt")
+        current_version: str = GeneralUtilities.read_text_from_file(resrepo_commit_id_file)
+
+        stdOut = [l.split("\t") for l in GeneralUtilities.string_to_lines(self.__sc.run_program("git", f"ls-remote {github_link}")[1])]
+        stdOut = [l for l in stdOut if l[1] == f"refs/heads/{branch}"]
+        GeneralUtilities.assert_condition(len(stdOut) == 1)
+        latest_version: str = stdOut[0][0]
+        if current_version != latest_version:
+            GeneralUtilities.write_text_to_file(resrepo_commit_id_file, latest_version)
+
+    @GeneralUtilities.check_arguments
+    def get_dependencies_which_are_ignored_from_updates(self, codeunit_folder: str, print_warnings_for_ignored_dependencies: bool) -> list[str]:
+        self.assert_is_codeunit_folder(codeunit_folder)
+        namespaces = {'cps': 'https://projects.aniondev.de/PublicProjects/Common/ProjectTemplates/-/tree/main/Conventions/RepositoryStructure/CommonProjectStructure', 'xsi': 'http://www.w3.org/2001/XMLSchema-instance'}
+        codeunit_name = os.path.basename(codeunit_folder)
+        codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
+        root: etree._ElementTree = etree.parse(codeunit_file)
+        ignoreddependencies = root.xpath('//cps:codeunit/cps:properties/cps:updatesettings/cps:ignoreddependencies/cps:ignoreddependency', namespaces=namespaces)
+        result = [x.text.replace("\\n", GeneralUtilities.empty_string).replace("\\r", GeneralUtilities.empty_string).replace("\n", GeneralUtilities.empty_string).replace("\r", GeneralUtilities.empty_string).strip() for x in ignoreddependencies]
+        if print_warnings_for_ignored_dependencies and len(result) > 0:
+            self.__sc.log.log(f"Codeunit {codeunit_name} contains the following dependencies which will are ignoed for automatic updates: "+', '.join(result), LogLevel.Warning)
+        return result
+    
+    @GeneralUtilities.check_arguments
+    def update_dependencies_of_package_json(self, folder_of_package_json: str) -> None:
+        #TODO move this to TFCPS_CodeUnitSpecific_NodeJS_Functions
+        if self.is_codeunit_folder(folder_of_package_json):
+            ignored_dependencies = self.get_dependencies_which_are_ignored_from_updates(folder_of_package_json, True)
+        else:
+            ignored_dependencies = []
+        # TODO consider ignored_dependencies
+        result = self.__sc.run_with_epew("npm", "outdated", folder_of_package_json, throw_exception_if_exitcode_is_not_zero=False)
+        if result[0] == 0:
+            return  # all dependencies up to date
+        elif result[0] == 1:
+            package_json_content = None
+            package_json_file = f"{folder_of_package_json}/package.json"
+            with open(package_json_file, "r", encoding="utf-8") as package_json_file_object:
+                package_json_content = json.load(package_json_file_object)
+                lines = GeneralUtilities.string_to_lines(result[1])[1:][:-1]
+                for line in lines:
+                    normalized_line_splitted = ' '.join(line.split()).split(" ")
+                    package = normalized_line_splitted[0]
+                    latest_version = normalized_line_splitted[3]
+                    if package in package_json_content["dependencies"]:
+                        package_json_content["dependencies"][package] = latest_version
+                    if package in package_json_content["devDependencies"]:
+                        package_json_content["devDependencies"][package] = latest_version
+            with open(package_json_file, "w", encoding="utf-8") as package_json_file_object:
+                json.dump(package_json_content, package_json_file_object, indent=4)
+            self.do_npm_install(folder_of_package_json, True,True)#TODO use_cache might be dangerous here
+        else:
+            self.__sc.log.log("Update dependencies resulted in an error.", LogLevel.Error)

{scriptcollection-4.0.59.dist-info → scriptcollection-4.0.62.dist-info}/METADATA

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

{scriptcollection-4.0.59.dist-info → scriptcollection-4.0.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=dxGOI4E9lG5v9jk_LajXCkM5nghliCDV8YB8Ihn160s,4541
-ScriptCollection/ScriptCollectionCore.py,sha256=mtg72npynGXVQ1c_LGrV_4x73_O-axIjk914aPughy4,142342
+ScriptCollection/ScriptCollectionCore.py,sha256=SXPOaedIr6JKt7OA23JpWJU5HDlYUD77Z83ZQt7d58w,142342
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=VyoVQPQ5t3VmRsR599tzsjRlnL42Hj3kubMmeoTQW7A,25441
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=m3bZZCoKV0mxME6HtDa3BAsGD4DSbiSp4XkqKOJyc9Y,7369
@@ -17,10 +17,10 @@ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=f9oGnopuzn3iDHC1A
 ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=bcJlfI062Eoq7MOIhun-_iNG7SdO1ZIuC_cylaoLI1s,6332
 ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv6Bt6hDFhvM,1943
 ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=7F9cwFy-7bxN5mkK9V_n7ffMPvBxLwzQvrAe60fbEMM,7245
-ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=1VNs7QxSjkZjjYi281LujZ1fOKP-LWHJKpdruA6L2Ws,21649
+ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=nNS8NavE7MKUOkisH5h8RZa9dcHQd5r8yFZWO4RQSpY,21645
 ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=CxdwUklhZVuJGp0vcokoH_KMXFzmlUlZwj77xFYijho,2242
 ScriptCollection/TFCPS/TFCPS_Tools_Dependencies.py,sha256=o7HI3ki3WWqlAiUsrh3Lky_w6UhYh9hdjYPGOhubQGA,414
-ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=lZb-LqBfIYhVTmqjpxfJ3Cp7YIbVcre62c5sElMi-xc,80894
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=cfZl0EM1I9USzFh6cp31BT5kpR0QnVUJDjWeLKiHUs8,85283
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=ylPvcdiN7RuqXpM-3uNqs40v1kyhaC0guV4JA2pIt_M,5234
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,8 +35,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=aF53bvcuZi
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=q7msAxCb5VIZ-xhFg1MfzUvWomQRKYldqmW42KFhyMU,6868
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.0.59.dist-info/METADATA,sha256=Hi-eMj8lIT6fxUx9obu3uvI1sIxitzVlXqKcyt6y3Ek,7688
-scriptcollection-4.0.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.59.dist-info/entry_points.txt,sha256=_izhaQEyHiyBIfM2zTYDaJ7qvgsP1WntkVChFnkWymE,4431
-scriptcollection-4.0.59.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.59.dist-info/RECORD,,
+scriptcollection-4.0.62.dist-info/METADATA,sha256=11a5AG-8xufjtCbRY9HuVcT9c5kZmieGdAYelRP_Vns,7688
+scriptcollection-4.0.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.0.62.dist-info/entry_points.txt,sha256=_izhaQEyHiyBIfM2zTYDaJ7qvgsP1WntkVChFnkWymE,4431
+scriptcollection-4.0.62.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.0.62.dist-info/RECORD,,