ScriptCollection 4.2.50__py3-none-any.whl → 4.2.51__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -35,7 +35,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .SCLog import SCLog, LogLevel
 
-version = "4.2.50"
+version = "4.2.51"
 __version__ = version
 
 class VSCodeWorkspaceShellTask:
@@ -202,7 +202,6 @@ class ScriptCollectionCore:
             GeneralUtilities.write_lines_to_file(result,["RegistryName;Username;Password"])
         return result
 
-    @GeneralUtilities.deprecated("Use OCIImageManager instead.")
     def add_image_to_custom_docker_image_registry(self,remote_hub:str,imagename_on_remote_hub:str,own_registry_address:str,imagename_on_own_registry:str,tag:str,registry_username:str,registry_password:str)->None:
         registry_username,registry_password=self.__load_credentials_if_required_and_available(remote_hub,registry_username,registry_password)
         source_address=f"{remote_hub}/{imagename_on_remote_hub}:{tag}"

ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py

@@ -73,8 +73,12 @@ class TFCPS_CodeUnit_BuildCodeUnit:
                 self.sc.log.log(line, LogLevel.Warning)
             for line in GeneralUtilities.string_to_lines(linting_result[2]):
                 self.sc.log.log(line, LogLevel.Warning)
+
         self.sc.log.log("Generate reference...")
-        self.sc.run_program("python", "GenerateReference.py", os.path.join(self.codeunit_folder, "Other", "Reference"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
+        try:
+            self.sc.run_program("python", "GenerateReference.py", os.path.join(self.codeunit_folder, "Other", "Reference"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
+        except Exception as e:
+            self.sc.log.log_exception(f"Generating reference failed with the following error",e, LogLevel.Warning)
         self.verify_artifact_exists(self.codeunit_folder, dict[str, bool]({"Reference": True}))
 
         if os.path.isfile(os.path.join(self.codeunit_folder, "Other", "OnBuildingFinished.py")):

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -1124,6 +1124,14 @@ class TFCPS_Tools_General:
         changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{projectversion}.md")
         self.__sc.run_program_argsasarray("gh", ["release", "create", f"v{projectversion}", "--repo",  github_repo, "--notes-file", changelog_file, "--title", f"Release v{projectversion}"]+artifact_files)
 
+    @GeneralUtilities.check_arguments
+    def get_dependency_version_in_resources_folder(self, resources_folder:str, dependency_name: str) ->str:
+        dependency_folder = os.path.join(resources_folder, "Dependencies", dependency_name)
+        version_file = os.path.join(dependency_folder, "Version.txt")
+        if not os.path.isfile(version_file):
+            raise ValueError(f"Version-file for dependency {dependency_name} does not exist. Expected location: {version_file}")
+        return GeneralUtilities.read_text_from_file(version_file)
+
     @GeneralUtilities.check_arguments
     def update_dependency_in_resources_folder(self, update_dependencies_file, dependency_name: str, latest_version_function: str) -> None:
         dependency_folder = GeneralUtilities.resolve_relative_path(f"../Resources/Dependencies/{dependency_name}", update_dependencies_file)
@@ -1279,7 +1287,6 @@ class TFCPS_Tools_General:
 """)
 
     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)

{scriptcollection-4.2.50.dist-info → scriptcollection-4.2.51.dist-info}/METADATA

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

{scriptcollection-4.2.50.dist-info → scriptcollection-4.2.51.dist-info}/RECORD

@@ -10,7 +10,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=E9pVzcAnNu1T6lP8jQNpSUJsXDB7ml4yQ_EiNM0p8JM,166402
+ScriptCollection/ScriptCollectionCore.py,sha256=M-jNhkIepjxeUKptq4RsIy-C0llCAjcPwMRAWXRG74Q,166337
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=Pa72cRybzBroy-OzzxZqKpFB58iY2kcf5yFfIAIPfXk,1627
 ScriptCollection/OCIImages/OCIImageManager.py,sha256=xTYnj68CRDkTjJiibSov1HSI0djmmcY6mwP6_fD0kCM,7141
@@ -24,14 +24,14 @@ ScriptCollection/Resources/CultureChooser/CultureChooser.js,sha256=5-4pwGDq5j1Un
 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_CodeUnit_BuildCodeUnit.py,sha256=vnNrwvNePvW2dQhnSusBjgvOssI3a1P3g94bNxNIr3o,8069
+ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=MieeAAKm1y58qXp1cCUN5mj5vwpq4Pc1uusUjPQzpvc,8237
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=glu25oK6xaeDAJKjLwtwCJ79fXFVz9_2G3qo9gp95BU,15292
 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=D8yTq-CoC8rL8FM-P9qFtfQbir8hHwnsTSniBlP1BBA,92525
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=9D7z6BSsjIS3O4wQn0IhPhGp_jA7S5jhtRuBoiE1ACs,93073
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=krF-SYvXyG1cAepj-5witV76suBvEumTApn7nY6Zin0,10564
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,8 +48,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=wKB5t-K7p3
 ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=nLw_eSUd_56jjgfcAvtUyzecSZ14mYmNJl0iu-1YNVk,13496
 ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-4.2.50.dist-info/METADATA,sha256=E1WZMMxQkFbrMshcDHu4ITwShdi-0p0jVqcWRKPlh1k,7690
-scriptcollection-4.2.50.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-scriptcollection-4.2.50.dist-info/entry_points.txt,sha256=FUA-dAZQISQRwFDJvo-tVVTVE0vrH0f0VR9XckeRvv0,4621
-scriptcollection-4.2.50.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.2.50.dist-info/RECORD,,
+scriptcollection-4.2.51.dist-info/METADATA,sha256=i3zDlK9zqCvXNelwE9-ITi04TrW75DUV9_MYaGb2Z-E,7690
+scriptcollection-4.2.51.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+scriptcollection-4.2.51.dist-info/entry_points.txt,sha256=FUA-dAZQISQRwFDJvo-tVVTVE0vrH0f0VR9XckeRvv0,4621
+scriptcollection-4.2.51.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.2.51.dist-info/RECORD,,