ScriptCollection 3.5.113__py3-none-any.whl → 3.5.115__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.113"
+version = "3.5.115"
 __version__ = version
 
 
@@ -469,6 +469,21 @@ class ScriptCollectionCore:
         if undo_all_changes_after_checkout:
             self.git_undo_all_changes(directory)
 
+    @GeneralUtilities.check_arguments
+    def merge_repository(self, repository_folder: str, remote: str, branch: str, pull_first_if_there_are_no_uncommitted_changes: bool = True):
+        if pull_first_if_there_are_no_uncommitted_changes:
+            uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+            if not uncommitted_changes:
+                self.git_pull(repository_folder, remote, branch, branch)
+                uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+                GeneralUtilities.assert_condition(not uncommitted_changes, f"Pulling remote \"{remote}\" in \"{repository_folder}\" caused new uncommitted files.")
+        self.git_checkout(repository_folder, branch)
+        self.git_commit(repository_folder, "Automatic commit due to merge")
+        self.git_fetch(repository_folder, remote)
+        self.git_merge(repository_folder, f"{remote}/{branch}", branch)
+        self.git_push_with_retry(repository_folder, remote, branch, branch)
+        self.git_checkout(repository_folder, branch)
+
     @GeneralUtilities.check_arguments
     def git_merge_abort(self, directory: str) -> None:
         self.assert_is_git_repository(directory)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -2548,7 +2548,8 @@ class TasksForCommonProjectStructure:
             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)
-            self.mark_current_version_as_supported(repository_folder, project_version, now, until_day)
+            from_day = datetime(now.year, now.month, now.day, 0, 0, 0)
+            self.mark_current_version_as_supported(repository_folder, project_version, from_day, until_day)
 
         project_resources_folder = os.path.join(repository_folder, "Other", "Scripts")
         PrepareBuildCodeunits_script_name = "PrepareBuildCodeunits.py"
@@ -3113,42 +3114,42 @@ class TasksForCommonProjectStructure:
         codeunits = self.get_codeunits(repository_folder)
         update_dependencies_script_filename = "UpdateDependencies.py"
         target_environmenttype = "QualityCheck"
-        self.build_codeunits(repository_folder, target_environmenttype=target_environmenttype, do_git_clean_when_no_changes=True, note="Prepare dependency-update")  # Required because update dependencies is not always possible for not-buildet codeunits (depends on the programming language or package manager)
-        GeneralUtilities.assert_condition(not self.__sc.git_repository_has_uncommitted_changes(repository_folder), "There are uncommitted changes in the repository.")
 
         # update dependencies of resources
         global_scripts_folder = os.path.join(repository_folder, "Other", "Scripts")
         if os.path.isfile(os.path.join(global_scripts_folder, update_dependencies_script_filename)):
+            self.build_codeunits(repository_folder, target_environmenttype=target_environmenttype, do_git_clean_when_no_changes=True, note="Prepare dependency-update")  # Required because update dependencies is not always possible for not-buildet codeunits (depends on the programming language or package manager)
+            GeneralUtilities.assert_condition(not self.__sc.git_repository_has_uncommitted_changes(repository_folder), "There are uncommitted changes in the repository.")
             self.__sc.run_program("python", update_dependencies_script_filename, global_scripts_folder, print_live_output=True)
 
-        # update dependencies of codeunits
-        something_was_updated = False
-        for codeunit in codeunits:
-            codeunit_file = os.path.join(repository_folder, codeunit, f"{codeunit}.codeunit.xml")
-            codeunit_has_updatable_dependencies = self.codeunit_has_updatable_dependencies(codeunit_file)
-            if codeunit_has_updatable_dependencies:
-                codeunit_folder = os.path.join(repository_folder, codeunit)
-                update_dependencies_script_folder = os.path.join(codeunit_folder, "Other")
-                GeneralUtilities.ensure_directory_exists(os.path.join(update_dependencies_script_folder, "Resources", "CodeAnalysisResult"))
-                self.__sc.run_program("python", update_dependencies_script_filename, update_dependencies_script_folder, verbosity, print_live_output=True)
-                if self.__sc.git_repository_has_uncommitted_changes(repository_folder):
-                    something_was_updated = True
-                    version_of_project = self.get_version_of_project(repository_folder)
-                    changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")
-                    if not os.path.isfile(changelog_file):
-                        GeneralUtilities.write_text_to_file(changelog_file, """# Release notes
-
-## Changes
-
-- Updated dependencies.
-""")
-                        GeneralUtilities.write_message_to_stdout(f"Updated dependencies in codeunit {codeunit}.")
-                else:
-                    GeneralUtilities.write_message_to_stdout(f"There are no dependencies to update in codeunit {codeunit}.")
-
-        if something_was_updated:
-            self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, False, f"Build codeunits due to updated dependencies")
-            self.__sc.git_commit(repository_folder, "Updated dependencies")
+            # update dependencies of codeunits
+            something_was_updated = False
+            for codeunit in codeunits:
+                codeunit_file = os.path.join(repository_folder, codeunit, f"{codeunit}.codeunit.xml")
+                codeunit_has_updatable_dependencies = self.codeunit_has_updatable_dependencies(codeunit_file)
+                if codeunit_has_updatable_dependencies:
+                    codeunit_folder = os.path.join(repository_folder, codeunit)
+                    update_dependencies_script_folder = os.path.join(codeunit_folder, "Other")
+                    GeneralUtilities.ensure_directory_exists(os.path.join(update_dependencies_script_folder, "Resources", "CodeAnalysisResult"))
+                    self.__sc.run_program("python", update_dependencies_script_filename, update_dependencies_script_folder, verbosity, print_live_output=True)
+                    if self.__sc.git_repository_has_uncommitted_changes(repository_folder):
+                        something_was_updated = True
+                        version_of_project = self.get_version_of_project(repository_folder)
+                        changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")
+                        if not os.path.isfile(changelog_file):
+                            GeneralUtilities.write_text_to_file(changelog_file, """# Release notes
+
+    ## Changes
+
+    - Updated dependencies.
+    """)
+                            GeneralUtilities.write_message_to_stdout(f"Updated dependencies in codeunit {codeunit}.")
+                    else:
+                        GeneralUtilities.write_message_to_stdout(f"There are no dependencies to update in codeunit {codeunit}.")
+
+            if something_was_updated:
+                self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, f"Build codeunits due to updated dependencies")
+                self.__sc.git_commit(repository_folder, "Updated dependencies")
 
     class GenericPrepareNewReleaseArguments:
         current_file: str

{scriptcollection-3.5.113.dist-info → scriptcollection-3.5.115.dist-info}/METADATA

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

{scriptcollection-3.5.113.dist-info → scriptcollection-3.5.115.dist-info}/RECORD

@@ -6,11 +6,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=5qjOBYiliyHV57GY8Y5dgUek512EVI8AzBF288R4fn4,2377
-ScriptCollection/ScriptCollectionCore.py,sha256=T-vQigYR2Hegx1jdJAUmtZQNHNYHh8b5O7eN9HUto8o,130404
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=14bNm3n6CFJFy5exs2u7HnmhSAcxoi5rRIxGhcA1GJk,233800
+ScriptCollection/ScriptCollectionCore.py,sha256=GdoH7P6iAgIYVNg_7zbcEGS2tDd2mY1zNoIbSlGdBdM,131500
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=d-fbnVk6DvsOIppn-rDslBHhMOsuPFAMRIacvu-F5eo,233988
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.113.dist-info/METADATA,sha256=9hTK1v1KaZuVoFoANgJeBMH4HHJKDU27S_GGbo8DKs8,7694
-scriptcollection-3.5.113.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-scriptcollection-3.5.113.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.113.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.113.dist-info/RECORD,,
+scriptcollection-3.5.115.dist-info/METADATA,sha256=PHmpwtvb892XkYTsogu0aRnXb8MpLS2VGyz2r62jt78,7694
+scriptcollection-3.5.115.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+scriptcollection-3.5.115.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.115.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.115.dist-info/RECORD,,

{scriptcollection-3.5.113.dist-info → scriptcollection-3.5.115.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any