ScriptCollection 3.5.49__py3-none-any.whl → 3.5.52__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -838,8 +838,11 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def assert_condition(condition: bool, information: str) -> None:
+    def assert_condition(condition: bool, information: str = None) -> None:
+        """Throws an exception if the condition is false."""
         if (not condition):
+            if information is None:
+                information = "Internal assertion error."
             raise ValueError("Condition failed. "+information)
 
     @staticmethod
@@ -911,3 +914,18 @@ class GeneralUtilities:
     @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 retry_action(action, amount_of_attempts: int) -> None:
+        amount_of_fails = 0
+        enabled = True
+        while enabled:
+            try:
+                action()
+                return
+            except Exception:
+                amount_of_fails = amount_of_fails+1
+                GeneralUtilities.assert_condition(not (amount_of_attempts < amount_of_fails))
+                if amount_of_fails == amount_of_attempts:
+                    raise

ScriptCollection/ScriptCollectionCore.py

@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.49"
+version = "3.5.52"
 __version__ = version
 
 
@@ -279,6 +279,10 @@ class ScriptCollectionCore:
     def git_remove_branch(self, folder: str, branchname: str) -> None:
         self.run_program("git", f"branch -D {branchname}", folder, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
 
+    @GeneralUtilities.check_arguments
+    def git_push_with_retry(self, folder: str, remotename: str, localbranchname: str, remotebranchname: str, forcepush: bool = False, pushalltags: bool = True, verbosity: int = 0, amount_of_amounts: int = 5) -> None:
+        GeneralUtilities.retry_action(lambda: self.git_push(folder, remotename, localbranchname, remotebranchname, forcepush, pushalltags), amount_of_amounts)
+
     @GeneralUtilities.check_arguments
     def git_push(self, folder: str, remotename: str, localbranchname: str, remotebranchname: str, forcepush: bool = False, pushalltags: bool = True, verbosity: int = 0) -> None:
         argument = ["push", "--recurse-submodules=on-demand", remotename, f"{localbranchname}:{remotebranchname}"]

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1291,7 +1291,7 @@ class TasksForCommonProjectStructure:
 
         self.__sc.git_commit(createReleaseInformation.reference_repository, f"Added reference of {createRelease_configuration.projectname} v{new_project_version}")
         if createRelease_configuration.reference_repository_remote_name is not None:
-            self.__sc.git_push(createReleaseInformation.reference_repository, createRelease_configuration.reference_repository_remote_name, createRelease_configuration.reference_repository_branch_name, createRelease_configuration.reference_repository_branch_name, verbosity=createRelease_configuration.verbosity)
+            self.__sc.git_push_with_retry(createReleaseInformation.reference_repository, createRelease_configuration.reference_repository_remote_name, createRelease_configuration.reference_repository_branch_name, createRelease_configuration.reference_repository_branch_name, verbosity=createRelease_configuration.verbosity)
         self.__sc.git_commit(build_repository_folder, f"Added {createRelease_configuration.projectname} release v{new_project_version}")
         GeneralUtilities.write_message_to_stdout(f"Finished release for project {createRelease_configuration.projectname} v{new_project_version} successfully.")
         return new_project_version
@@ -1323,11 +1323,11 @@ class TasksForCommonProjectStructure:
 
         if information.push_source_branch:
             GeneralUtilities.write_message_to_stdout("Push source-branch...")
-            self.__sc.git_push(information.repository, information.push_source_branch_remote_name, information.sourcebranch, information.sourcebranch, pushalltags=True, verbosity=information.verbosity)
+            self.__sc.git_push_with_retry(information.repository, information.push_source_branch_remote_name, information.sourcebranch, information.sourcebranch, pushalltags=True, verbosity=information.verbosity)
 
         if information.push_target_branch:
             GeneralUtilities.write_message_to_stdout("Push target-branch...")
-            self.__sc.git_push(information.repository, information.push_target_branch_remote_name, information.targetbranch, information.targetbranch, pushalltags=True, verbosity=information.verbosity)
+            self.__sc.git_push_with_retry(information.repository, information.push_target_branch_remote_name, information.targetbranch, information.targetbranch, pushalltags=True, verbosity=information.verbosity)
 
         return project_version
 
@@ -2471,7 +2471,7 @@ class TasksForCommonProjectStructure:
         if not self.__suport_information_exists(repository_folder, project_version):
             support_time = timedelta(days=365*2+30*3+1)  # TODO make this configurable
             until = now + support_time
-            until_day=datetime(until.year,until.month,until.day,0,0,0)
+            until_day = datetime(until.year, until.month, until.day, 0, 0, 0)
             self.mark_current_version_as_supported(repository_folder, project_version, now, until_day)
 
         if len(sorted_codeunits) == 0:
@@ -3052,5 +3052,5 @@ class TasksForCommonProjectStructure:
         self.__sc.git_fetch(ref_repo, update_http_documentation_arguments.common_remote_name)
         self.__sc.git_merge(ref_repo, update_http_documentation_arguments.common_remote_name+"/"+update_http_documentation_arguments.main_branch_name, update_http_documentation_arguments.main_branch_name)
         self.__sc.git_checkout(ref_repo, update_http_documentation_arguments.main_branch_name)
-        self.__sc.git_push(ref_repo, update_http_documentation_arguments.common_remote_name, update_http_documentation_arguments.main_branch_name, update_http_documentation_arguments.main_branch_name)
+        self.__sc.git_push_with_retry(ref_repo, update_http_documentation_arguments.common_remote_name, update_http_documentation_arguments.main_branch_name, update_http_documentation_arguments.main_branch_name)
         self.__sc.git_commit(GeneralUtilities.resolve_relative_path("../..", folder_of_this_file), f"Updated content of {update_http_documentation_arguments.product_name} v{update_http_documentation_arguments.new_project_version} in {update_http_documentation_arguments.reference_repository_name}-submodule")

{ScriptCollection-3.5.49.dist-info → ScriptCollection-3.5.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ScriptCollection
-Version: 3.5.49
+Version: 3.5.52
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -24,7 +24,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build>=1.2.2.post1
 Requires-Dist: coverage>=7.6.10
-Requires-Dist: cyclonedx-bom>=5.1.1
+Requires-Dist: cyclonedx-bom>=5.1.2
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: lcov-cobertura>=2.0.2
@@ -40,7 +40,7 @@ Requires-Dist: pytest>=8.3.4
 Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: qrcode>=8.0
 Requires-Dist: send2trash>=1.8.3
-Requires-Dist: twine>=6.0.1
+Requires-Dist: twine>=6.1.0
 Requires-Dist: xmlschema>=3.4.3
 
 # ScriptCollection

{ScriptCollection-3.5.49.dist-info → ScriptCollection-3.5.52.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ScriptCollection/Executables.py,sha256=ls3wGZpt48YwwtO0QGWWyIImSE87SyzbL-WxhpwQJug,20837
-ScriptCollection/GeneralUtilities.py,sha256=Kh_oSUtCyBra5LuH5_5_HkyM14YvA21ug8cK4ODsamI,37744
+ScriptCollection/GeneralUtilities.py,sha256=PTe5Uz3leVoAO8Ncz5HZr_GhwZYA9XxBxIVfqPspc2s,38426
 ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZfT89mU,1395
 ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-T54IJcHQ,2324
 ScriptCollection/ProgramRunnerEpew.py,sha256=C2Rs3YWOWWWJct7XmKphp5CF1tf0j4Fp-ljV2drLTfs,6349
 ScriptCollection/ProgramRunnerPopen.py,sha256=UGWUK0345DmtnD1gsKa1B3tBLDzKKXUGnSbIuCSWzLU,3714
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=CgWu2xqIYMu06BJLsBtCZ3v_GNgqzUU84xCtNKyC3O4,106702
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=w19PqN9ICOF7vF9Muxbs-t5wPPh1qqJUvxsY5QAfpB8,213960
+ScriptCollection/ScriptCollectionCore.py,sha256=CObBUiwJtZFI4wdWxSnVGrN8JPicrHw6tJ_wTwuV0LE,107117
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=LZszSMaMQ9xQe6HeTg_-AHYKSihBYkBeGNZyb4hUEqM,214011
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.49.dist-info/METADATA,sha256=aqDa6blUTgJpB6VFlVPGx0SjJwBJWye0lt9ihAl2R_s,7665
-ScriptCollection-3.5.49.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.49.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
-ScriptCollection-3.5.49.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.49.dist-info/RECORD,,
+ScriptCollection-3.5.52.dist-info/METADATA,sha256=KN9serefOoSGdTQPkRuXkyjVMgd-9AF_LubU4oUctKQ,7665
+ScriptCollection-3.5.52.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.52.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
+ScriptCollection-3.5.52.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.52.dist-info/RECORD,,