ScriptCollection 3.5.20__py3-none-any.whl → 3.5.21__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -30,7 +30,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.20"
+version = "3.5.21"
 __version__ = version
 
 
@@ -261,8 +261,11 @@ class ScriptCollectionCore:
         return result[1].replace('\r', '').replace('\n', '')
 
     @GeneralUtilities.check_arguments
-    def git_pull(self, folder: str, remote: str, localbranchname: str, remotebranchname: str) -> None:
-        self.run_program("git", f"pull {remote} {remotebranchname}:{localbranchname}", folder, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
+    def git_pull(self, folder: str, remote: str, localbranchname: str, remotebranchname: str, force: bool = False) -> None:
+        argument = f"pull {remote} {remotebranchname}:{localbranchname}"
+        if force:
+            argument = f"{argument} --force"
+        self.run_program("git", argument, folder, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
 
     @GeneralUtilities.check_arguments
     def git_list_remote_branches(self, folder: str, remote: str, fetch: bool) -> list[str]:

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1391,7 +1391,7 @@ class TasksForCommonProjectStructure:
 
         # Check codeunit-conformity
         # TODO check if foldername=="<codeunitname>[.codeunit.xml]" == <codeunitname> in file
-        supported_codeunitspecificationversion = "2.9.1"  # should always be the latest version of the ProjectTemplates-repository
+        supported_codeunitspecificationversion = "2.9.4"  # should always be the latest version of the ProjectTemplates-repository
         codeunit_file = os.path.join(codeunit_folder, f"{codeunit_name}.codeunit.xml")
         if not os.path.isfile(codeunit_file):
             raise ValueError(f'Codeunitfile "{codeunit_file}" does not exist.')
@@ -1493,7 +1493,7 @@ class TasksForCommonProjectStructure:
         shutil.copy(changelog_file, target_folder)
 
         # Hints-file
-        hints_file = os.path.join(codeunit_folder, "Other", "Hints.md")
+        hints_file = os.path.join(codeunit_folder, "Other", "Reference", "ReferenceContent", "Hints.md")
         if not os.path.isfile(hints_file):
             raise ValueError(f"Hints-file '{hints_file}' does not exist.")
 

{ScriptCollection-3.5.20.dist-info → ScriptCollection-3.5.21.dist-info}/METADATA

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

{ScriptCollection-3.5.20.dist-info → ScriptCollection-3.5.21.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=a0v9sXIrZ2ymtcwcZUFsBUKsrhzYFOUAhzd28s9I1KQ,100252
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=9Nm7btdvikTOCOQaSXRV7sadaIi2aVqTWVCvUcYclK8,190588
+ScriptCollection/ScriptCollectionCore.py,sha256=kqV46fmxYIpD7YgI-qNaRKHICwAIj3rFLTlwoUa6Xlw,100364
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=U9OldjgT1BIyvrMkc-TtvswHdRjtkGU2JVZSN7odbJg,190621
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.20.dist-info/METADATA,sha256=H0PzPBf00yKeONM1Mer8i5AbyoDpZeEfiqzg5r1T-5E,7678
-ScriptCollection-3.5.20.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ScriptCollection-3.5.20.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
-ScriptCollection-3.5.20.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.20.dist-info/RECORD,,
+ScriptCollection-3.5.21.dist-info/METADATA,sha256=jpt0hQnIPc51QjYhbbABwhCys1ZS7g6Q6OlyDzjNoUA,7678
+ScriptCollection-3.5.21.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ScriptCollection-3.5.21.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
+ScriptCollection-3.5.21.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.21.dist-info/RECORD,,