ScriptCollection 3.5.77__py3-none-any.whl → 3.5.79__py3-none-any.whl

ScriptCollection/Executables.py

@@ -377,7 +377,7 @@ def GenerateARC42ReferenceTemplate() -> int:
 def CreateChangelogEntry() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument('-f', '--repositoryfolder', required=False, default=".")
-    parser.add_argument('-m', '--message', required=True)
+    parser.add_argument('-m', '--message', required=False, default="Updates.")
     parser.add_argument('-c', '--commit', action='store_true', required=False, default=False)
     args = parser.parse_args()
 

ScriptCollection/GeneralUtilities.py

@@ -964,7 +964,7 @@ class GeneralUtilities:
                     message=f"Action failed {amount_of_attempts} times."
                     if action_name is not None:
                         message=f"{message} Name of action: {action_name}"
-                    GeneralUtilities.write_exception_to_stderr(message)
+                    GeneralUtilities.write_message_to_stderr(message)
                     raise
         return None
 

ScriptCollection/ScriptCollectionCore.py

@@ -32,7 +32,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.77"
+version = "3.5.79"
 __version__ = version
 
 
@@ -192,8 +192,7 @@ class ScriptCollectionCore:
         until_as_string = self.__datetime_to_string_for_git(until)
         result = filter(lambda line: not GeneralUtilities.string_is_none_or_whitespace(line), self.run_program("git", f'log --since "{since_as_string}" --until "{until_as_string}" --pretty=format:"%H" --no-patch', repository_folder, throw_exception_if_exitcode_is_not_zero=True)[1].split("\n").replace("\r", ""))
         if ignore_commits_which_are_not_in_history_of_head:
-            result = [commit_id for commit_id in result if self.git_commit_is_ancestor(
-                repository_folder, commit_id)]
+            result = [commit_id for commit_id in result if self.git_commit_is_ancestor( repository_folder, commit_id)]
         return result
 
     @GeneralUtilities.check_arguments
@@ -391,10 +390,8 @@ class ScriptCollectionCore:
         self.run_program_argsasarray("git", ['checkout', '.'], directory, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
 
     @GeneralUtilities.check_arguments
-    def git_commit(self, directory: str, message: str, author_name: str = None, author_email: str = None, stage_all_changes: bool = True, no_changes_behavior: int = 0) -> str:
-        # no_changes_behavior=0 => No commit
-        # no_changes_behavior=1 => Commit anyway
-        # no_changes_behavior=2 => Exception
+    def git_commit(self, directory: str, message: str="Saved changes.", author_name: str = None, author_email: str = None, stage_all_changes: bool = True, no_changes_behavior: int = 0) -> str:
+        """no_changes_behavior=0 => No commit; no_changes_behavior=1 => Commit anyway; no_changes_behavior=2 => Exception"""
         author_name = GeneralUtilities.str_none_safe(author_name).strip()
         author_email = GeneralUtilities.str_none_safe(author_email).strip()
         argument = ['commit', '--quiet', '--allow-empty', '--message', message]
@@ -1390,6 +1387,7 @@ class ScriptCollectionCore:
                 try:
                     while not q_stdout.empty():
                         out_line:str=q_stdout.get_nowait()
+                        out_line=out_line.replace("\r","").replace("\n","")
                         if GeneralUtilities.string_has_content(out_line):
                             stdout_result.append(out_line)
                             reading_stdout_last_time_resulted_in_exception = False
@@ -1403,6 +1401,7 @@ class ScriptCollectionCore:
                 try:
                     while not q_stderr.empty():
                         err_line:str=q_stderr.get_nowait()
+                        err_line=err_line.replace("\r","").replace("\n","")
                         if GeneralUtilities.string_has_content(err_line):
                             stderr_result.append(err_line)
                             reading_stderr_last_time_resulted_in_exception = False
@@ -1817,15 +1816,15 @@ DNS                 = {domain}
     def update_dependencies_of_dotnet_project(self, csproj_file: str, verbosity: int, ignored_dependencies: list[str]):
         folder = os.path.dirname(csproj_file)
         csproj_filename = os.path.basename(csproj_file)
-        GeneralUtilities.write_message_to_stderr(f"Check for updates in {csproj_filename}")
-        result = self.run_program_with_retry("dotnet", f"list {csproj_filename} package --outdated", folder)
+        GeneralUtilities.write_message_to_stdout(f"Check for updates in {csproj_filename}")
+        result = self.run_program_with_retry("dotnet", f"list {csproj_filename} package --outdated", folder,print_errors_as_information=True)
         for line in result[1].replace("\r", "").split("\n"):
             # Relevant output-lines are something like "    > NJsonSchema             10.7.0        10.7.0      10.9.0"
             if ">" in line:
                 package_name = line.replace(">", "").strip().split(" ")[0]
                 if not (package_name in ignored_dependencies):
-                    GeneralUtilities.write_message_to_stderr(f"Update package {package_name}")
-                    self.run_program("dotnet", f"add {csproj_filename} package {package_name}", folder)
+                    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 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

@@ -2897,7 +2897,7 @@ class TasksForCommonProjectStructure:
         # 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.__sc.run_program("python", update_dependencies_script_filename, global_scripts_folder)
+            self.__sc.run_program("python", update_dependencies_script_filename, global_scripts_folder,print_live_output=True)
 
         # update dependencies of codeunits
         for codeunit in codeunits:
@@ -2907,7 +2907,7 @@ class TasksForCommonProjectStructure:
                 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)
+                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)
                     changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")

{ScriptCollection-3.5.77.dist-info → ScriptCollection-3.5.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ScriptCollection
-Version: 3.5.77
+Version: 3.5.79
 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.12
-Requires-Dist: cyclonedx-bom>=5.1.2
+Requires-Dist: cyclonedx-bom>=5.2.0
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: lcov-cobertura>=2.0.2

{ScriptCollection-3.5.77.dist-info → ScriptCollection-3.5.79.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ScriptCollection/Executables.py,sha256=zxDRhv6UHzP0F9lFQvfPv8twy27BEA0-jIMvZfcZTb4,30016
-ScriptCollection/GeneralUtilities.py,sha256=qO7oYjdqmSZxKDoU5leA0XsXS1CdofwTpA8nd0j_b8w,40372
+ScriptCollection/Executables.py,sha256=KAs82A9AsrpTY39Ohg1UrtZN-6e5_Ql17UbLlO0fZfA,30037
+ScriptCollection/GeneralUtilities.py,sha256=ShcDc8N7B_Ad9V--cbmsuirfBaUYvuhkbq9NMR03bDA,40370
 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=UyKF_9b5wwDMshQ8ckxmL_72TEp-voHTGbvAdfb3EeQ,118968
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=n3x4XRyjabsL0SuMGZz3LJiq5ctjz7mMAS77QoAJFP8,215347
+ScriptCollection/ScriptCollectionCore.py,sha256=KeMiOHpmVmxAMbIQrzSOTE5QygrXKUpyFXVJ-7tUVJg,119176
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=Au3ipZR6JiBdF2V9phaNeWunPi5YWKjoem4RA-HShyw,215393
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.77.dist-info/METADATA,sha256=tq75ry337xZ0alx95ud5g_JBR-OMbrwGS-DT0j1upWo,7664
-ScriptCollection-3.5.77.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ScriptCollection-3.5.77.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
-ScriptCollection-3.5.77.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.77.dist-info/RECORD,,
+ScriptCollection-3.5.79.dist-info/METADATA,sha256=T-FE9553JDODO_d6hSoH7IAnlpfX1iOql_7z7FYFsbs,7664
+ScriptCollection-3.5.79.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ScriptCollection-3.5.79.dist-info/entry_points.txt,sha256=1jAL5AuB8mvdw2v-6E7wCZFThurQxchiQynL8DCi-Yg,3545
+ScriptCollection-3.5.79.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.79.dist-info/RECORD,,