ScriptCollection 3.5.81__py3-none-any.whl → 3.5.83__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -943,11 +943,21 @@ class GeneralUtilities:
     def assert_file_exists(file: str) -> str:
         GeneralUtilities.assert_condition(os.path.isfile(file), f"File '{file}' does not exist.")
 
+    @staticmethod
+    @check_arguments
+    def assert_file_does_not_exist(file: str) -> str:
+        GeneralUtilities.assert_condition(not os.path.isfile(file), f"File '{file}' exists.")
+
     @staticmethod
     @check_arguments
     def assert_folder_exists(folder: str) -> str:
         GeneralUtilities.assert_condition(os.path.isdir(folder), f"Folder '{folder}' does not exist.")
 
+    @staticmethod
+    @check_arguments
+    def assert_folder_does_not_exist(folder: str) -> str:
+        GeneralUtilities.assert_condition(not os.path.isdir(folder), f"Folder '{folder}' exists.")
+
     @staticmethod
     @check_arguments
     def retry_action(action, amount_of_attempts: int,action_name:str=None) -> None:

ScriptCollection/ScriptCollectionCore.py

@@ -32,7 +32,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.81"
+version = "3.5.83"
 __version__ = version
 
 
@@ -1826,6 +1826,41 @@ DNS                 = {domain}
                     GeneralUtilities.write_message_to_stdout(f"Update package {package_name}...")
                     self.run_program("dotnet", f"add {csproj_filename} package {package_name}", folder,print_errors_as_information=True)
 
+
+    @GeneralUtilities.check_arguments
+    def dotnet_package_is_available(self,package_name:str,package_version:str,source:str):
+        default_source_address="nuget.org"
+        if source==default_source_address:
+            GeneralUtilities.write_message_to_stdout(f"Wait until package {package_name} v{package_version} is available on {source}.")
+            headers = {'Cache-Control': 'no-cache'}
+            r=requests.get(f"https://api.{default_source_address}/v3-flatcontainer/{package_name.lower()}/{package_version}/{package_name.lower()}.nuspec", timeout=5,headers=headers)
+            return r.status_code==200
+        else:
+            raise ValueError(f"dotnet_package_is_available is not implemented yet for other sources than {default_source_address}.")
+
+    @GeneralUtilities.check_arguments
+    def wait_until_dotnet_package_is_available(self,package_name:str,package_version:str,source:str):
+        while not self.dotnet_package_is_available(package_name,package_version,source):
+            time.sleep(5)
+
+
+    @GeneralUtilities.check_arguments
+    def python_package_is_available(self,package_name:str,package_version:str,source:str):
+        default_source_address="pypi.org"
+        if source==default_source_address:
+            GeneralUtilities.write_message_to_stdout(f"Wait until package {package_name} v{package_version} is available on {source}.")
+            headers = {'Cache-Control': 'no-cache'}
+            r=requests.get(f"https://{default_source_address}/pypi/{package_name}/{package_version}/json", timeout=5,headers=headers)
+            return r.status_code==200
+        else:
+            raise ValueError(f"python_package_is_available is not implemented yet for other sources than {default_source_address}.")
+
+    @GeneralUtilities.check_arguments
+    def python_until_dotnet_package_is_available(self,package_name:str,package_version:str,source:str):
+        while not self.python_package_is_available(package_name,package_version,source):
+            time.sleep(5)
+
+
     @GeneralUtilities.check_arguments
     def create_deb_package(self, toolname: str, binary_folder: str, control_file_content: str, deb_output_folder: str, verbosity: int, permission_of_executable_file_as_octet_triple: int) -> None:
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1018,7 +1018,7 @@ class TasksForCommonProjectStructure:
         target_folder_base = os.path.join(information.artifacts_folder, information.projectname, project_version)
         GeneralUtilities.ensure_directory_exists(target_folder_base)
 
-        self.build_codeunits(information.repository, information.verbosity, information.target_environmenttype_for_productive, information.additional_arguments_file, False, information.export_target, [], True, "Productive build")
+        self.build_codeunits(information.repository, information.verbosity, information.target_environmenttype_for_productive, information.additional_arguments_file, False, information.export_target, [], True, "Generate artifacts")# Generate artifacts after merge (because now are constants like commit-id of the new version available)
 
         reference_folder = os.path.join(information.reference_repository, "ReferenceContent")
 
@@ -1034,8 +1034,8 @@ class TasksForCommonProjectStructure:
 
             # Copy reference of codeunit to reference-repository
             codeunit_version = self.get_version_of_codeunit_folder(os.path.join(information.repository, codeunitname))
-            self.__export_codeunit_reference_content_to_reference_repository(f"v{project_version}", False, reference_folder, information.repository, codeunitname, information.projectname, codeunit_version, information.public_repository_url,                                                                             f"v{project_version}")
-            self.__export_codeunit_reference_content_to_reference_repository("Latest", True, reference_folder, information.repository, codeunitname, information.projectname, codeunit_version, information.public_repository_url,                                                                             information.target_branch_name)
+            self.__export_codeunit_reference_content_to_reference_repository(f"v{project_version}", False, reference_folder, information.repository, codeunitname, information.projectname, codeunit_version, information.public_repository_url, f"v{project_version}")
+            self.__export_codeunit_reference_content_to_reference_repository("Latest", True, reference_folder, information.repository, codeunitname, information.projectname, codeunit_version, information.public_repository_url, information.target_branch_name)
 
             # Generate reference
             self.__generate_entire_reference(information.projectname, project_version, reference_folder)
@@ -1315,7 +1315,7 @@ class TasksForCommonProjectStructure:
         self.__sc.run_program("git", "clean -dfx", information.repository,  verbosity=information.verbosity, throw_exception_if_exitcode_is_not_zero=True)
         project_version = self.__sc.get_semver_version_from_gitversion(information.repository)
 
-        self.build_codeunits(information.repository, information.verbosity, information.target_environmenttype_for_qualitycheck, information.additional_arguments_file, False, information.export_target, [], True, "Productive build")
+        self.build_codeunits(information.repository, information.verbosity, information.target_environmenttype_for_qualitycheck, information.additional_arguments_file, False, information.export_target, [], True, "Productive build")#verify hat codeunits are buildable with productive-config before merge
 
         self.assert_no_uncommitted_changes(information.repository)
 
@@ -1948,10 +1948,16 @@ class TasksForCommonProjectStructure:
             src_file_psw = os.path.join(src_folder, f"{codeunit_name}{certificate_resource_name}.password")
 
             trg_folder = os.path.join(codeunit_folder, "Other", "Workspace", "Configuration", "Certificates")
-            GeneralUtilities.ensure_directory_exists(trg_folder)
             trg_file_pfx = os.path.join(trg_folder, f"{domain}.pfx")
             trg_file_psw = os.path.join(trg_folder, f"{domain}.password")
 
+            GeneralUtilities.assert_file_exists(src_file_pfx)
+            GeneralUtilities.assert_file_exists(src_file_psw)
+            GeneralUtilities.ensure_file_does_not_exist(trg_file_pfx)
+            GeneralUtilities.ensure_file_does_not_exist(trg_file_psw)
+
+            GeneralUtilities.ensure_directory_exists(trg_folder)
+
             GeneralUtilities.ensure_directory_exists(trg_folder)
             shutil.copyfile(src_file_pfx, trg_file_pfx)
             shutil.copyfile(src_file_psw, trg_file_psw)

{ScriptCollection-3.5.81.dist-info → ScriptCollection-3.5.83.dist-info}/METADATA

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

{ScriptCollection-3.5.81.dist-info → ScriptCollection-3.5.83.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ScriptCollection/Executables.py,sha256=KAs82A9AsrpTY39Ohg1UrtZN-6e5_Ql17UbLlO0fZfA,30037
-ScriptCollection/GeneralUtilities.py,sha256=ShcDc8N7B_Ad9V--cbmsuirfBaUYvuhkbq9NMR03bDA,40370
+ScriptCollection/GeneralUtilities.py,sha256=VVbbGFD4qLwWV211-E-n3faP2fZGc8mOBlKLd0oKHl4,40765
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=kekWmkxTqWUdBFQqcpta0eLnWWQ0N2h9LslDuQDGjqA,119176
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=CgvDBDK2mH3tAstoTCa9xfnr2lYISaPhwUpXW7IbscU,215649
+ScriptCollection/ScriptCollectionCore.py,sha256=DMAt3OV5-ydbKKFbc_1MV9i1Bv_1sK_2AsBez-_HJ-o,121187
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=n6og3gADK7oBd5_9F-XNKVlQ0bO9EL7irdOSJAh-Vtc,215940
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.81.dist-info/METADATA,sha256=gLgJwoEw-H3NYdiljSCYtnsapI6_L9rLn-suUX_-T-E,7664
-ScriptCollection-3.5.81.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.81.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
-ScriptCollection-3.5.81.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.81.dist-info/RECORD,,
+ScriptCollection-3.5.83.dist-info/METADATA,sha256=4K38CjZq0Ik1dmTNilhSXT-uGpNbKMWl_tsovThshbA,7664
+ScriptCollection-3.5.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.83.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
+ScriptCollection-3.5.83.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.83.dist-info/RECORD,,