ScriptCollection 4.0.57__py3-none-any.whl → 4.0.59__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.57"
+version = "4.0.59"
 __version__ = version
 
 

ScriptCollection/TFCPS/TFCPS_MergeToStable.py

@@ -83,6 +83,7 @@ class TFCPS_MergeToStable:
       
 
         self.sc.log.log("Release artifacts...")
+        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)
             if self.createRelease_configuration.artifacts_target_folder is not None:
@@ -107,7 +108,6 @@ class TFCPS_MergeToStable:
             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
-            project_version:str=self.tFCPS_Tools_General.get_version_of_project(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

@@ -1263,3 +1263,20 @@ 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)
+
+    @GeneralUtilities.check_arguments
+    def update_submodule(self, repository_folder: str, submodule_name: str, local_branch: str = "main", remote_branch: str = "main", remote: str = "origin"):
+        submodule_folder = GeneralUtilities.resolve_relative_path("Other/Resources/Submodules/"+submodule_name, repository_folder)
+        self.__sc.git_fetch(submodule_folder, remote)
+        self.__sc.git_checkout(submodule_folder, local_branch)
+        self.__sc.git_pull(submodule_folder, remote, local_branch, remote_branch, True)
+        current_version = self.__sc.get_semver_version_from_gitversion(repository_folder)
+        changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{current_version}.md")
+        if (not os.path.isfile(changelog_file)):
+            GeneralUtilities.ensure_file_exists(changelog_file)
+            GeneralUtilities.write_text_to_file(changelog_file, """# Release notes
+
+## Changes
+
+- Updated geo-ip-database.
+""")

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

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

{scriptcollection-4.0.57.dist-info → scriptcollection-4.0.59.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=V_8is0ONoR4txEI2b6u2bp0XsnY0RUX_vnmvltFdYt8,142342
+ScriptCollection/ScriptCollectionCore.py,sha256=mtg72npynGXVQ1c_LGrV_4x73_O-axIjk914aPughy4,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=ifB1K6A903vvfH0LvtiFbZgYSgR94thfEI-jjf40LpU,21653
+ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=1VNs7QxSjkZjjYi281LujZ1fOKP-LWHJKpdruA6L2Ws,21649
 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=nIOEeZ3UWzzD5S7RkMnJedDV8oHlPMaCc_2qPH1YxBY,79912
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=lZb-LqBfIYhVTmqjpxfJ3Cp7YIbVcre62c5sElMi-xc,80894
 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.57.dist-info/METADATA,sha256=bBQTULTctKsehHdAE7Che7mEqqncQzEv9I7RD1wSsXc,7688
-scriptcollection-4.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.57.dist-info/entry_points.txt,sha256=_izhaQEyHiyBIfM2zTYDaJ7qvgsP1WntkVChFnkWymE,4431
-scriptcollection-4.0.57.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.57.dist-info/RECORD,,
+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,,