ScriptCollection 3.5.125__py3-none-any.whl → 3.5.127__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.125"
+version = "3.5.127"
 __version__ = version
 
 
@@ -1543,7 +1543,11 @@ class ScriptCollectionCore:
                             reading_stdout_last_time_resulted_in_exception = False
                             if print_live_output:
                                 # print(out_line, end='\n', file=sys.stdout, flush=False)
-                                log.log(out_line, LogLevel.Information)
+                                loglevel = LogLevel.Information
+                                if out_line.startswith("Debug: "):
+                                    loglevel = LogLevel.Debug
+                                    out_line = out_line[len("Debug: "):]
+                                log.log(out_line, loglevel)
                     # if print_live_output:
                     #    sys.stdout.flush()
                 except Empty:
@@ -1558,7 +1562,13 @@ class ScriptCollectionCore:
                             reading_stderr_last_time_resulted_in_exception = False
                             if print_live_output:
                                 # print(err_line, end='\n', file=sys.stdout if print_errors_as_information else sys.stderr, flush=False)
-                                log.log(err_line, LogLevel.Error if print_errors_as_information else LogLevel.Information)
+                                loglevel = LogLevel.Error
+                                if out_line.startswith("Warning: "):
+                                    loglevel = LogLevel.Warning
+                                    out_line = out_line[len("Warning: "):]
+                                if print_errors_as_information:  # "errors" in "print_errors_as_information" means: all what is written to std-err
+                                    loglevel = LogLevel.Information
+                                log.log(err_line, loglevel)
                     # if print_live_output:
                     #    if print_errors_as_information:
                     #        sys.stdout.flush()

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1423,7 +1423,7 @@ class TasksForCommonProjectStructure:
         self.__sc.format_xml_file(sbom_folder+f"/{codeunitname}.{codeunitversion}.sbom.xml")
 
     @GeneralUtilities.check_arguments
-    def push_docker_build_artifact(self, push_artifacts_file: str, registry: str, verbosity: int, push_readme: bool, commandline_arguments: list[str], repository_folder_name: str,image_name:str=None) -> None:
+    def push_docker_build_artifact(self, push_artifacts_file: str, registry: str, verbosity: int, push_readme: bool, commandline_arguments: list[str], repository_folder_name: str, image_name: str = None) -> None:
         folder_of_this_file = os.path.dirname(push_artifacts_file)
         filename = os.path.basename(push_artifacts_file)
         codeunitname_regex: str = "([a-zA-Z0-9]+)"
@@ -1443,7 +1443,7 @@ class TasksForCommonProjectStructure:
         codeunit_version = self.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml"))
         if image_name is None:
             image_name = codeunitname
-        image_name=image_name.lower()
+        image_name = image_name.lower()
         repo = f"{registry}/{image_name}"
         image_latest = f"{repo}:latest"
         image_version = f"{repo}:{codeunit_version}"
@@ -3110,6 +3110,17 @@ class TasksForCommonProjectStructure:
         # TODO validate artifactsinformation_file against xsd
         GeneralUtilities.write_message_to_stdout(f"Finished building codeunit {codeunit_name} without errors.")
 
+    def __add_changelog_file(self, repository_folder: str, version_of_project: str):
+        changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")
+        if not os.path.isfile(changelog_file):
+            GeneralUtilities.ensure_file_exists(changelog_file)
+            GeneralUtilities.write_text_to_file(changelog_file, """# Release notes
+
+## Changes
+
+- Updated dependencies.
+""")
+
     @GeneralUtilities.check_arguments
     def generic_update_dependencies(self, repository_folder: str, verbosity: int = 1):
         # Prepare
@@ -3118,42 +3129,35 @@ class TasksForCommonProjectStructure:
         codeunits = self.get_codeunits(repository_folder)
         update_dependencies_script_filename = "UpdateDependencies.py"
         target_environmenttype = "QualityCheck"
+        project_name: str = os.path.basename(repository_folder)
+        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)
+            version_of_project = self.get_version_of_project(repository_folder)
+            self.__add_changelog_file(repository_folder, version_of_project)
+            GeneralUtilities.write_message_to_stdout(f"Updated global dependencies of {project_name}.")
+            self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build codeunits due to 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")
+        # update dependencies of codeunits
+        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):
+                    version_of_project = self.get_version_of_project(repository_folder)
+                    self.__add_changelog_file(repository_folder, version_of_project)
+                    GeneralUtilities.write_message_to_stdout(f"Updated dependencies in codeunit {codeunit}.")
+                    self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, [], False, "Build codeunits due to updated dependencies")
+
+        self.__sc.git_commit(repository_folder, "Updated dependencies")
 
     class GenericPrepareNewReleaseArguments:
         current_file: str
@@ -3195,8 +3199,11 @@ class TasksForCommonProjectStructure:
         self.__sc.git_commit(build_repository_folder, "Updated submodules")
 
         if "--dependencyupdate" in generic_prepare_new_release_arguments.commandline_arguments:
+            GeneralUtilities.write_message_to_stdout("Debug: Update dependencies...")
             self.generic_update_dependencies(repository_folder)
             self.assert_no_uncommitted_changes(repository_folder)
+        else:
+            GeneralUtilities.write_message_to_stdout("Debug: Dependency-update skipped.")
 
         GeneralUtilities.write_message_to_stdout(f"Check reference-repository...")
         now = datetime.now()

{scriptcollection-3.5.125.dist-info → scriptcollection-3.5.127.dist-info}/METADATA

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

{scriptcollection-3.5.125.dist-info → scriptcollection-3.5.127.dist-info}/RECORD

@@ -7,11 +7,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=2oWISBU4RhAWBPtsM_nPWiOJ6UZEY1T4O9iXtjhRZ24,3685
-ScriptCollection/ScriptCollectionCore.py,sha256=xH-pJ0DFOy8ibXQiyduDBGnjIhfiZPbiOqF5RTQjrrg,127849
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=4aEuIf89jbgKE4uMYm4DlPDe9Iu1Zujo8wPOzDld09w,234867
+ScriptCollection/ScriptCollectionCore.py,sha256=CFsuljhoVFonD1hi0mV2K1xemYY5v1DUcKM_P1R5_sc,128521
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=R3jy7P_LcqiY1vGruZW6VYupaNlWKXtBFE5pVGRVC4Y,235370
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.125.dist-info/METADATA,sha256=zO67ZgggA-XAv_JgNChnCtvTUM_x8CwaXVlgCXSLIGE,7694
-scriptcollection-3.5.125.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-scriptcollection-3.5.125.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.125.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.125.dist-info/RECORD,,
+scriptcollection-3.5.127.dist-info/METADATA,sha256=K8nyMjZzOUUQf8WRxFQTCy1pcPvz4MFsNRgx-lEWTvA,7694
+scriptcollection-3.5.127.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scriptcollection-3.5.127.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.127.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.127.dist-info/RECORD,,