ScriptCollection 3.5.124__py3-none-any.whl → 3.5.126__py3-none-any.whl

ScriptCollection/SCLog.py

@@ -25,9 +25,9 @@ class SCLog:
     def __init__(self, log_file: str = None, loglevel: LogLevel = None, add_overhead: bool = False, print_as_color: bool = True):
         self.log_file = log_file
         if loglevel is None:
-            self.loglevel = loglevel
-        else:
             self.loglevel = LogLevel.Information
+        else:
+            self.loglevel = loglevel
         self.add_overhead = add_overhead
         self.print_as_color = print_as_color
 

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 from .SCLog import SCLog, LogLevel
 
-version = "3.5.124"
+version = "3.5.126"
 __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}"
@@ -3195,8 +3195,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.124.dist-info → scriptcollection-3.5.126.dist-info}/METADATA

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

{scriptcollection-3.5.124.dist-info → scriptcollection-3.5.126.dist-info}/RECORD

@@ -6,12 +6,12 @@ ScriptCollection/ProcessesRunner.py,sha256=3mu4ZxzZleQo0Op6o9EYTCFiJfb6kx5ov2YfZ
 ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4bQNM6RV6Y,2480
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
-ScriptCollection/SCLog.py,sha256=dfd5ulvRXVgytxUZgWOhmxPMUIUiyLknxBDaGaFJKr0,3685
-ScriptCollection/ScriptCollectionCore.py,sha256=DEyAfkveCH9lClhXeMfRqIvIwwz3IUtE980x33W4vmA,127849
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=4aEuIf89jbgKE4uMYm4DlPDe9Iu1Zujo8wPOzDld09w,234867
+ScriptCollection/SCLog.py,sha256=2oWISBU4RhAWBPtsM_nPWiOJ6UZEY1T4O9iXtjhRZ24,3685
+ScriptCollection/ScriptCollectionCore.py,sha256=yOj8BWkqZZezXIdBedP-TuvYDOWe7jt0B2vp9qVIAQo,128521
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=Xcf7E990A8OkIf2eAG8ZgTNPzIkd1zEDIxJVlKb8Uio,235063
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.124.dist-info/METADATA,sha256=kLzBhCaJrXsbJiWxY0uaxsAPjir1vQQA5oG7MVeBuJc,7694
-scriptcollection-3.5.124.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-scriptcollection-3.5.124.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.124.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.124.dist-info/RECORD,,
+scriptcollection-3.5.126.dist-info/METADATA,sha256=JdqmRzVM1PdsbQRe3VzeJWLow_O1M1sWZOiiAMycfP4,7694
+scriptcollection-3.5.126.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+scriptcollection-3.5.126.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.126.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.126.dist-info/RECORD,,