ScriptCollection 4.0.35__py3-none-any.whl → 4.0.37__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -8,6 +8,7 @@ import multiprocessing
 import time
 from io import BytesIO
 import itertools
+import zipfile
 import math
 import base64
 import os
@@ -36,7 +37,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "4.0.35"
+version = "4.0.37"
 __version__ = version
 
 
@@ -1841,10 +1842,10 @@ class ScriptCollectionCore:
     # </run programs>
 
     @GeneralUtilities.check_arguments
-    def extract_archive_with_7z(self, unzip_program_file: str, zipfile: str, password: str, output_directory: str) -> None:
+    def extract_archive_with_7z(self, unzip_program_file: str, zip_file: str, password: str, output_directory: str) -> None:
         password_set = not password is None
-        file_name = Path(zipfile).name
-        file_folder = os.path.dirname(zipfile)
+        file_name = Path(zip_file).name
+        file_folder = os.path.dirname(zip_file)
         argument = "x"
         if password_set:
             argument = f"{argument} -p\"{password}\""
@@ -2496,3 +2497,15 @@ OCR-content:
             if fnmatch.fnmatch(file, f"*{pattern}*"):
                 return True
         return False
+    
+    @GeneralUtilities.check_arguments
+    def create_zip_archive(self, folder:str,zip_file:str) -> None:
+        GeneralUtilities.assert_folder_exists(folder)
+        GeneralUtilities.assert_file_does_not_exist(zip_file)
+        folder = os.path.abspath(folder)
+        with zipfile.ZipFile(zip_file, "w", zipfile.ZIP_DEFLATED) as zipf:
+            for root, _, files in os.walk(folder):
+                for file in files:
+                    file_path = os.path.join(root, file)
+                    arcname = os.path.relpath(file_path, start=folder)
+                    zipf.write(file_path, arcname)

ScriptCollection/TFCPS/TFCPS_MergeToStable.py

@@ -93,7 +93,7 @@ class TFCPS_MergeToStable:
                 GeneralUtilities.ensure_directory_exists(target_folder)
                 codeunit_version:str=self.tFCPS_Tools_General.get_version_of_codeunit(os.path.join(self.createRelease_configuration.repository,codeunit,f"{codeunit}.codeunit.xml"))
                 target_file:str=os.path.join(target_folder,f"{codeunit}.v{codeunit_version}.Artifacts.zip")
-                self.sc.run_program_argsasarray("tar",[f"-cf",target_file,"-C",source_folder, "."])
+                self.sc.create_zip_archive(source_folder,target_file)
 
             #push artifacts
             push_script:str=os.path.join( self.createRelease_configuration.build_repo,"Scripts","CreateRelease",f"PushArtifacts.{codeunit}.py")
@@ -132,6 +132,7 @@ class TFCPS_MergeToStable:
         self.sc.git_push_with_retry(self.createRelease_configuration.build_repo,self.createRelease_configuration.build_repo_remote_name,self.createRelease_configuration.build_repo_main_branch_name,self.createRelease_configuration.build_repo_main_branch_name)
         self.sc.git_push_with_retry(reference_repo,self.createRelease_configuration.reference_remote_name,self.createRelease_configuration.reference_repo_main_branch_name,self.createRelease_configuration.reference_repo_main_branch_name)
 
+
     def __remove_outdated_version(self,reference_repo:str):
         now = GeneralUtilities.get_now()
         for unsupported_version in self.tFCPS_Tools_General.get_unsupported_versions(self.createRelease_configuration.repository, now):

ScriptCollection/TFCPS/TFCPS_Tools_General.py

@@ -830,7 +830,7 @@ class TFCPS_Tools_General:
                     GeneralUtilities.ensure_directory_does_not_exist(grylibrary_folder)
             GeneralUtilities.ensure_directory_does_not_exist(grylibrary_folder)
             GeneralUtilities.ensure_directory_exists(grylibrary_folder)
-            archive_name = f"GRYLibrary.v{grylibrary_latest_version}.Productive.Artifacts.zip"
+            archive_name = f"GRYLibrary.v{grylibrary_latest_version}.Artifacts.zip"
             archive_download_link = f"https://github.com/anionDev/GRYLibrary/releases/download/v{grylibrary_latest_version}/{archive_name}"
             archive_file = os.path.join(grylibrary_folder, archive_name)
             urllib.request.urlretrieve(archive_download_link, archive_file)
@@ -1097,7 +1097,7 @@ class TFCPS_Tools_General:
         artifact_files = []
         codeunits = self.get_codeunits(repository_folder)
         for codeunit in codeunits:
-            artifact_files.append(self.__sc.find_file_by_extension(f"{build_artifacts_folder}/{productname}/{projectversion}/{codeunit}", "Productive.Artifacts.zip"))
+            artifact_files.append(self.__sc.find_file_by_extension(f"{build_artifacts_folder}/{productname}/{projectversion}/{codeunit}", "Artifacts.zip"))
         if additional_attached_files is not None:
             for additional_attached_file in additional_attached_files:
                 artifact_files.append(additional_attached_file)

{scriptcollection-4.0.35.dist-info → scriptcollection-4.0.37.dist-info}/METADATA

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

{scriptcollection-4.0.35.dist-info → scriptcollection-4.0.37.dist-info}/RECORD

@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerEpew.py,sha256=TJdDx9zIMSiCaXh8X-ekrMlbXfGtmd0Mmyx
 ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrRjAPIwT5Y,37
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=dxGOI4E9lG5v9jk_LajXCkM5nghliCDV8YB8Ihn160s,4541
-ScriptCollection/ScriptCollectionCore.py,sha256=j0HB03ntr9wYBB8TxHKbIY0oCpCwpMkPTvSSrBnsH_8,140598
+ScriptCollection/ScriptCollectionCore.py,sha256=GQ5obYMsmHQWU5N9sS6JM-bkf0pX_f2LKkNAJL9ObVw,141223
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=Cj89Xhzf5CRSDVH_-0JachQMsPHfjkz8jtRi_BpiGvY,25979
 ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=4rYKgTAga11NiDx8YUqz3K_Q4eX_n3kC6lvNdXEa24s,7389
@@ -17,10 +17,10 @@ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=DGaQk85r8P5ANDhga
 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=41g219jaBRZ2VQCrWM4-Trvervrt8b5oATPwIIGNpag,7244
-ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=enp9vWDOZc_Bc_HVbrnbbDi0vj63WpEWRITpPB3NfU4,21682
+ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=ifB1K6A903vvfH0LvtiFbZgYSgR94thfEI-jjf40LpU,21653
 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=PmS034kSaSeL2P_h-6nWi_-RsPmKS08NGk51EfmDeEU,69477
+ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=AeO4U8oF6v4iyKOunn0h-U_5miAtBmMGmjSUmmHosw0,69455
 ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=-g8h2gCf9rh0KJXUBeQD5d0qLJgBU3Q8DNZXM1UXC04,5259
 ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,8 +35,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=dnuDlQXThF
 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.35.dist-info/METADATA,sha256=f4zbt7ywLUkUPlI9pAXjDwTh02hA9niuU6XcXJARdn8,7688
-scriptcollection-4.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scriptcollection-4.0.35.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
-scriptcollection-4.0.35.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-4.0.35.dist-info/RECORD,,
+scriptcollection-4.0.37.dist-info/METADATA,sha256=cOs_YxL-H9lvyW52nwyLQQXVGoJnBT-chT-SJcExgiI,7688
+scriptcollection-4.0.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scriptcollection-4.0.37.dist-info/entry_points.txt,sha256=NeU26D6q7d8n2cmKQiOvHK21w1C7D2kxoNRJaKiyZ5w,4295
+scriptcollection-4.0.37.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-4.0.37.dist-info/RECORD,,