ScriptCollection 3.5.39__py3-none-any.whl → 3.5.41__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.39"
+version = "3.5.41"
 __version__ = version
 
 

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+31)  # TODO make this configurable
             until = now + support_time
             self.mark_current_version_as_supported(repository_folder, project_version, now, until)
 

{ScriptCollection-3.5.39.dist-info → ScriptCollection-3.5.41.dist-info}/METADATA

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

{ScriptCollection-3.5.39.dist-info → ScriptCollection-3.5.41.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=s9sizADPsescdKLtcns3nH0bMvyJ3JzuEFeF6GR51Ug,102878
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=niMk1lor857i23agOqA1D2t7H997a_cSwOUwzPA3NgQ,207535
+ScriptCollection/ScriptCollectionCore.py,sha256=MjpXXphdDfdlIgrX0DQPX2WtplCl117eT0y_EpyPa4Q,102878
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=hVnQ17-7jVS2kI7u5I2VCbuUMetl2R3NUPFkNekBxTI,207679
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.39.dist-info/METADATA,sha256=Dg6WH96IX9gpzf6UjQskmLGdBWlSQIBUggO1uXRFxMA,7664
-ScriptCollection-3.5.39.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ScriptCollection-3.5.39.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
-ScriptCollection-3.5.39.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.39.dist-info/RECORD,,
+ScriptCollection-3.5.41.dist-info/METADATA,sha256=D7Gxs5JHtleF0SimdwCC73DL-MV1eCypnjriNEZcpqQ,7664
+ScriptCollection-3.5.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ScriptCollection-3.5.41.dist-info/entry_points.txt,sha256=_O7BmQ81LdDfrj5uOhjshg9Xc-tABHQJIxDOyOGRzzI,2397
+ScriptCollection-3.5.41.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.41.dist-info/RECORD,,