ScriptCollection 3.5.8__py3-none-any.whl → 3.5.10__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -29,7 +29,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.8"
+version = "3.5.10"
 __version__ = version
 
 
@@ -275,7 +275,7 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def git_pull(self, folder: str, remote: str, localbranchname: str, remotebranchname: str) -> None:
-        self.run_program("git", f"pull {folder} {remote} {remotebranchname}:{localbranchname}", folder, throw_exception_if_exitcode_is_not_zero=True, verbosity=0)
+        self.run_program("git", f"pull {remote} {remotebranchname}:{localbranchname}", 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]:
@@ -1605,7 +1605,8 @@ DNS                 = {domain}
         lines = GeneralUtilities.read_lines_from_file(file)
         new_lines = []
         for line in lines:
-            new_lines.append(self.__get_updated_line_for_python_requirements(line.strip()))
+            if GeneralUtilities.string_has_content(line):
+                new_lines.append(self.__get_updated_line_for_python_requirements(line.strip()))
         GeneralUtilities.write_lines_to_file(file, new_lines)
 
     @GeneralUtilities.check_arguments

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1883,7 +1883,7 @@ class TasksForCommonProjectStructure:
         root: etree._ElementTree = etree.parse(codeunit_file)
         ignoreddependencies = root.xpath('//cps:codeunit/cps:properties/cps:updatesettings/cps:ignoreddependencies/cps:ignoreddependency', namespaces=namespaces)
         result = [x.text.replace("\\n", "").replace("\\r", "").replace("\n", "").replace("\r", "").strip() for x in ignoreddependencies]
-        if print_warnings_for_ignored_dependencies and len(result > 0):
+        if print_warnings_for_ignored_dependencies and len(result) > 0:
             GeneralUtilities.write_message_to_stderr(f"Warning: Codeunit {codeunit_name} contains the following dependencies which will are ignoed for automatic updates: "+', '.join(result))
         return result
 
@@ -2569,13 +2569,13 @@ class TasksForCommonProjectStructure:
             GeneralUtilities.write_message_to_stdout("Release will not be done because there are no changed which can be released.")
             return False, None
         else:
+            self.__sc.git_checkout(repository_folder, merge_source_branch)
             reference_repo: str = os.path.join(build_repository_folder, "Submodules", f"{generic_create_release_arguments.product_name}Reference")
             self.__sc.git_commit(reference_repo, "Updated reference")
             self.__sc.git_commit(build_repository_folder, "Updated submodule")
 
             # create release
             new_version = self.merge_to_stable_branch(generic_create_release_arguments.current_file, createReleaseConfiguration)
-            self.__sc.git_checkout(repository_folder, merge_source_branch)
             return True, new_version
 
     class UpdateHTTPDocumentationArguments:

{ScriptCollection-3.5.8.dist-info → ScriptCollection-3.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.8
+Version: 3.5.10
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -23,25 +23,25 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: build >=1.2.1
-Requires-Dist: coverage >=7.5.1
-Requires-Dist: cyclonedx-bom >=4.4.3
+Requires-Dist: coverage >=7.6.0
+Requires-Dist: cyclonedx-bom >=4.5.0
 Requires-Dist: defusedxml >=0.7.1
 Requires-Dist: keyboard >=0.13.5
 Requires-Dist: lcov-cobertura >=2.0.2
 Requires-Dist: lxml >=5.2.2
 Requires-Dist: ntplib >=0.4.0
-Requires-Dist: Pillow >=10.3.0
+Requires-Dist: Pillow >=10.4.0
 Requires-Dist: pycdlib >=1.14.0
 Requires-Dist: Pygments >=2.18.0
-Requires-Dist: pylint >=3.2.0
-Requires-Dist: pyOpenSSL >=24.1.0
+Requires-Dist: pylint >=3.2.6
+Requires-Dist: pyOpenSSL >=24.2.1
 Requires-Dist: PyPDF2 >=3.0.1
-Requires-Dist: pytest >=8.2.0
+Requires-Dist: pytest >=8.3.2
 Requires-Dist: PyYAML >=6.0.1
 Requires-Dist: qrcode >=7.4.2
 Requires-Dist: send2trash >=1.8.3
-Requires-Dist: twine >=5.0.0
-Requires-Dist: xmlschema >=3.3.1
+Requires-Dist: twine >=5.1.1
+Requires-Dist: xmlschema >=3.3.2
 
 # ScriptCollection
 

{ScriptCollection-3.5.8.dist-info → ScriptCollection-3.5.10.dist-info}/RECORD

@@ -5,12 +5,12 @@ ScriptCollection/ProgramRunnerBase.py,sha256=W4MaDroJHARRtcvPkBC2AS_qgDSRIqOkMvG
 ScriptCollection/ProgramRunnerEpew.py,sha256=lx_jR3W8KavBpZo44u2FrOca_EWWgUb3_w_YKGRrAyM,6471
 ScriptCollection/ProgramRunnerPopen.py,sha256=5QFplojwfGS8_WdYrg5nE6__QFB5iaMA0EP8OGfgPoY,3526
 ScriptCollection/RPStream.py,sha256=NRRHL3YSP3D9MuAV2jB_--0KUKCsvJGxeKnxgrRZ9kY,1545
-ScriptCollection/ScriptCollectionCore.py,sha256=muGC1Xd3xbBU8ZkIocvnE4_5IJd8mfHdE2b4fwzBGB4,97508
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=jExRHYZQfRJWY4NDboREI1NfYjHMvIabsKZ05qi8DoA,186707
+ScriptCollection/ScriptCollectionCore.py,sha256=TZQ1Z2mo9FcqzddxmFnFvJ01clasE4dFN5DQuIKlpVY,97563
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=Wk7nAbSI1BevltSmWRC4CKtKH3XsavpVM5PHaCiTlRQ,186707
 ScriptCollection/UpdateCertificates.py,sha256=lfmVuify-Fqq-vGJusDDUsJVhA-rVLwW2Jx9iLwmkBo,7916
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ScriptCollection-3.5.8.dist-info/METADATA,sha256=Ek02QzQWx7ZT6xSxEDI8TvGBhUFCRdb735Xj6BjIveE,7679
-ScriptCollection-3.5.8.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-ScriptCollection-3.5.8.dist-info/entry_points.txt,sha256=dwvB9HRGvqst5xlYIGmmwuFN7lBKhxvndmnNrQOfu8w,2153
-ScriptCollection-3.5.8.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-ScriptCollection-3.5.8.dist-info/RECORD,,
+ScriptCollection-3.5.10.dist-info/METADATA,sha256=V0RkV2wEdYxh9fFHQSmSYh-yaSvDkhTKyw5VQaCZVr8,7680
+ScriptCollection-3.5.10.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+ScriptCollection-3.5.10.dist-info/entry_points.txt,sha256=dwvB9HRGvqst5xlYIGmmwuFN7lBKhxvndmnNrQOfu8w,2153
+ScriptCollection-3.5.10.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.10.dist-info/RECORD,,

{ScriptCollection-3.5.8.dist-info → ScriptCollection-3.5.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any