ScriptCollection 3.5.40__py3-none-any.whl → 3.5.42__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -31,7 +31,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.40"
+version = "3.5.42"
 __version__ = version
 
 
@@ -185,13 +185,14 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def git_commit_is_ancestor(self, repository_folder: str,  ancestor: str, descendant: str = "HEAD") -> bool:
-        exit_code = self.run_program_argsasarray("git", ["merge-base", "--is-ancestor", ancestor, descendant], repository_folder, throw_exception_if_exitcode_is_not_zero=False)[0]
+        result = self.run_program_argsasarray("git", ["merge-base", "--is-ancestor", ancestor, descendant], repository_folder, throw_exception_if_exitcode_is_not_zero=False)
+        exit_code = result[0]
         if exit_code == 0:
             return True
         elif exit_code == 1:
             return False
         else:
-            raise ValueError(f"Can not calculate if {ancestor} is an ancestor of {descendant} in repository {repository_folder}.")
+            raise ValueError(f'Can not calculate if {ancestor} is an ancestor of {descendant} in repository {repository_folder}. Outout of "{repository_folder}> git merge-base --is-ancestor {ancestor} {descendant}": Exitcode: {exit_code}; StdOut: {result[1]}; StdErr: {result[2]}.')
 
     @GeneralUtilities.check_arguments
     def __git_changes_helper(self, repository_folder: str, arguments_as_array: list[str]) -> bool:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1375,7 +1375,7 @@ class TasksForCommonProjectStructure:
         sc.run_program("docker", f"push {image_latest}", verbosity=verbosity)
         sc.run_program("docker", f"push {image_version}", verbosity=verbosity)
         if push_readme:
-            sc.run_program("docker", f"pushrm {repo}", codeunit_folder, verbosity=verbosity)
+            sc.run_program("docker-pushrm", f"{repo}", codeunit_folder, verbosity=verbosity)
 
     @GeneralUtilities.check_arguments
     def get_dependent_code_units(self, codeunit_file: str) -> set[str]:
@@ -2194,7 +2194,7 @@ class TasksForCommonProjectStructure:
             GeneralUtilities.write_message_to_stderr("Update dependencies resulted in an error.")
 
     @GeneralUtilities.check_arguments
-    def generate_tasksfile_from_workspace_file(self, repository_folder: str) -> None:
+    def generate_tasksfile_from_workspace_file(self, repository_folder: str, append_cli_args_at_end: bool = False) -> None:
         sc: ScriptCollectionCore = ScriptCollectionCore()
         workspace_file: str = sc.find_file_by_extension(repository_folder, "code-workspace")
         task_file: str = os.path.join(repository_folder, "Taskfile.yml")
@@ -2226,11 +2226,13 @@ class TasksForCommonProjectStructure:
                     if len(args) > 1:
                         command_with_args = f"{command_with_args} {' '.join(args)}"
 
+                if append_cli_args_at_end:
+                    command_with_args = f"{command_with_args} {{{{.CLI_ARGS}}}}"
                 lines.append(f"  {name}:")
                 lines.append(f'    desc: "{description}"')
                 lines.append(f'    dir: "{cwd}"')
                 lines.append("    cmds:")
-                lines.append(f"      - {command_with_args} {{{{.CLI_ARGS}}}}")
+                lines.append(f"      - {command_with_args}")
                 lines.append('    aliases:')
                 lines.append(f'      - {name.lower()}')
                 if "aliases" in task:
@@ -2401,7 +2403,7 @@ class TasksForCommonProjectStructure:
 
         now = datetime.now()
         if not self.__suport_information_exists(repository_folder, project_version):
-            support_time = timedelta(days=365*2+31)  # TODO make this configurable
+            support_time = timedelta(days=365*2+30*3)  # TODO make this configurable
             until = now + support_time
             self.mark_current_version_as_supported(repository_folder, project_version, now, until)
 

{ScriptCollection-3.5.40.dist-info → ScriptCollection-3.5.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.40
+Version: 3.5.42
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -23,7 +23,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build>=1.2.2.post1
-Requires-Dist: coverage>=7.6.9
+Requires-Dist: coverage>=7.6.10
 Requires-Dist: cyclonedx-bom>=5.1.1
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5

{ScriptCollection-3.5.40.dist-info → ScriptCollection-3.5.42.dist-info}/RECORD

@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=7QAjoqOz6XPmJH19F2k-Z1fFQB_uZnPFvn-
 ScriptCollection/ProgramRunnerEpew.py,sha256=C2Rs3YWOWWWJct7XmKphp5CF1tf0j4Fp-ljV2drLTfs,6349
 ScriptCollection/ProgramRunnerPopen.py,sha256=G3LgQUVCfaq7XjBsGzalElH31Hbr0etttGR2_H87YzA,3512
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=Zo68H4BEe_cPk77qFmLjAGHUOwifCAoD0X2xZChYItA,102878
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=ZjVJTENpRUHxvBoCmdLVCgtHGspTYaK-R0SuC_M2fxM,207535
+ScriptCollection/ScriptCollectionCore.py,sha256=0Vc-GCZOCb4oBkCd9emMD8-c2f9UzRzPPNojaLCiuvw,103054
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=bOECB5Za31yN7avwZ00bDVgu4DPe7DYcnxfuW-5LoHM,207681
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.40.dist-info/METADATA,sha256=KBzXynicDcodoWaA6AUwXZtIfdQnT8TIxlyzogpwkwI,7664
-ScriptCollection-3.5.40.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ScriptCollection-3.5.40.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
-ScriptCollection-3.5.40.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.40.dist-info/RECORD,,
+ScriptCollection-3.5.42.dist-info/METADATA,sha256=OlsqMMN_p7tmZn6pF8NMROX3FqK9_MMCAi92bIPTz2A,7665
+ScriptCollection-3.5.42.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ScriptCollection-3.5.42.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
+ScriptCollection-3.5.42.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.42.dist-info/RECORD,,