ScriptCollection 3.5.104__py3-none-any.whl → 3.5.106__py3-none-any.whl

ScriptCollection/GeneralUtilities.py

@@ -133,33 +133,34 @@ class GeneralUtilities:
 
     @staticmethod
     @check_arguments
-    def copy_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files=False) -> None:
-        GeneralUtilities.__copy_or_move_content_of_folder(source_directory, target_directory, overwrite_existing_files, False)
+    def copy_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files=False,filtertext:str=None) -> None:
+        GeneralUtilities.__copy_or_move_content_of_folder(source_directory, target_directory, overwrite_existing_files, False,filtertext)
 
     @staticmethod
     @check_arguments
-    def move_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files=False) -> None:
-        GeneralUtilities.__copy_or_move_content_of_folder(source_directory, target_directory, overwrite_existing_files, True)
+    def move_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files=False,filtertext:str=None) -> None:
+        GeneralUtilities.__copy_or_move_content_of_folder(source_directory, target_directory, overwrite_existing_files, True,filtertext)
 
     @staticmethod
     @check_arguments
-    def __copy_or_move_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files, remove_source: bool) -> None:
+    def __copy_or_move_content_of_folder(source_directory: str, target_directory: str, overwrite_existing_files, remove_source: bool,filtertext:str=None) -> None:
         srcDirFull = GeneralUtilities.resolve_relative_path_from_current_working_directory(source_directory)
         dstDirFull = GeneralUtilities.resolve_relative_path_from_current_working_directory(target_directory)
         if (os.path.isdir(source_directory)):
             GeneralUtilities.ensure_directory_exists(target_directory)
             for file in GeneralUtilities.get_direct_files_of_folder(srcDirFull):
                 filename = os.path.basename(file)
-                targetfile = os.path.join(dstDirFull, filename)
-                if (os.path.isfile(targetfile)):
-                    if overwrite_existing_files:
-                        GeneralUtilities.ensure_file_does_not_exist(targetfile)
+                if filtertext is None or re.match(filtertext, file):
+                    targetfile = os.path.join(dstDirFull, filename)
+                    if (os.path.isfile(targetfile)):
+                        if overwrite_existing_files:
+                            GeneralUtilities.ensure_file_does_not_exist(targetfile)
+                        else:
+                            raise ValueError(f"Targetfile '{targetfile}' does already exist.")
+                    if remove_source:
+                        shutil.move(file, dstDirFull)
                     else:
-                        raise ValueError(f"Targetfile {targetfile} does already exist")
-                if remove_source:
-                    shutil.move(file, dstDirFull)
-                else:
-                    shutil.copy(file, dstDirFull)
+                        shutil.copy(file, dstDirFull)
             for sub_folder in GeneralUtilities.get_direct_folders_of_folder(srcDirFull):
                 foldername = os.path.basename(sub_folder)
                 sub_target = os.path.join(dstDirFull, foldername)

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.104"
+version = "3.5.106"
 __version__ = version
 
 
@@ -1868,7 +1868,8 @@ DNS                 = {domain}
         self.run_program_argsasarray("openssl", ['pkcs12', '-export', '-out', f'{filename}.pfx', f'-inkey', f'{filename}.key', '-in', f'{filename}.crt', '-password', f'pass:{password}'], folder)
 
     @GeneralUtilities.check_arguments
-    def update_dependencies_of_python_in_requirementstxt_file(self, file: str, verbosity: int):
+    def update_dependencies_of_python_in_requirementstxt_file(self, file: str,ignored_dependencies:list[str], verbosity: int):
+        #TODO consider ignored_dependencies
         lines = GeneralUtilities.read_lines_from_file(file)
         new_lines = []
         for line in lines:
@@ -1898,7 +1899,8 @@ DNS                 = {domain}
             raise ValueError(f'Unexpected line in requirements-file: "{line}"')
 
     @GeneralUtilities.check_arguments
-    def update_dependencies_of_python_in_setupcfg_file(self, setup_cfg_file: str, verbosity: int):
+    def update_dependencies_of_python_in_setupcfg_file(self, setup_cfg_file: str,ignored_dependencies:list[str], verbosity: int):
+        #TODO consider ignored_dependencies
         lines = GeneralUtilities.read_lines_from_file(setup_cfg_file)
         new_lines = []
         requirement_parsing_mode = False
@@ -2277,3 +2279,6 @@ TXDX
         element = ET.XML(GeneralUtilities.read_text_from_file(file, encoding))
         ET.indent(element)
         GeneralUtilities.write_text_to_file(file, ET.tostring(element, encoding="unicode"), encoding)
+
+    def install_requirementstxt_file(self,requirements_txt_file: str, folder: str, verbosity: int):
+        self.run_program_argsasarray("pip", ["install", "-r", requirements_txt_file], folder, verbosity=verbosity)

ScriptCollection/TasksForCommonProjectStructure.py

@@ -1560,6 +1560,9 @@ class TasksForCommonProjectStructure:
             combined_file = os.path.join(codeunit_folder, file)
             if not os.path.isfile(combined_file):
                 raise ValueError(f'The mandatory file "{file}" does not exist in the codeunit-folder.')
+            
+        if os.path.isfile(os.path.join(codeunit_folder,"Other","requirements.txt")):
+            self.install_requirementstxt_for_codeunit(codeunit_folder,verbosity)
 
         # Check developer
         if self.validate_developers_of_repository:
@@ -2264,16 +2267,32 @@ class TasksForCommonProjectStructure:
         ignored_dependencies = self.get_dependencies_which_are_ignored_from_updates(codeunit_folder, True)
         # TODO implement
 
+    @GeneralUtilities.check_arguments
+    def update_dependencies_of_typical_python_repository_requirements(self, repository_folder: str, verbosity: int, cmd_args: list[str]) -> None:
+        verbosity = self.get_verbosity_from_commandline_arguments(cmd_args, verbosity)
+
+        development_requirements_file = os.path.join(repository_folder, "Other","requirements.txt")
+        if (os.path.isfile(development_requirements_file)):
+            self.__sc.update_dependencies_of_python_in_requirementstxt_file(development_requirements_file,[], verbosity)
+
     @GeneralUtilities.check_arguments
     def update_dependencies_of_typical_python_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]) -> None:
         codeunit_folder = GeneralUtilities.resolve_relative_path("..", os.path.dirname(update_script_file))
         ignored_dependencies = self.get_dependencies_which_are_ignored_from_updates(codeunit_folder, True)
         # TODO consider ignored_dependencies
         verbosity = self.get_verbosity_from_commandline_arguments(cmd_args, verbosity)
-        self.__sc.update_dependencies_of_python_in_setupcfg_file(os.path.join(codeunit_folder, "setup.cfg"), verbosity)
-        development_requirements_file = os.path.join(codeunit_folder, "requirements.txt")
+
+        setup_cfg=os.path.join(codeunit_folder, "setup.cfg")
+        if (os.path.isfile(setup_cfg)):
+            self.__sc.update_dependencies_of_python_in_setupcfg_file(setup_cfg,ignored_dependencies, verbosity)
+
+        development_requirements_file = os.path.join(codeunit_folder, "requirements.txt")#required for codeunits which contain python-code which need third-party dependencies
         if (os.path.isfile(development_requirements_file)):
-            self.__sc.update_dependencies_of_python_in_requirementstxt_file(development_requirements_file, verbosity)
+            self.__sc.update_dependencies_of_python_in_requirementstxt_file(development_requirements_file,ignored_dependencies, verbosity)
+
+        development_requirements_file2 = os.path.join(codeunit_folder, "Other","requirements.txt")#required for codeunits which contain python-scripts which needs third-party dependencies
+        if (os.path.isfile(development_requirements_file2)):
+            self.__sc.update_dependencies_of_python_in_requirementstxt_file(development_requirements_file2, ignored_dependencies,verbosity)
 
     @GeneralUtilities.check_arguments
     def update_dependencies_of_typical_dotnet_codeunit(self, update_script_file: str, verbosity: int, cmd_args: list[str]) -> None:
@@ -3271,3 +3290,28 @@ class TasksForCommonProjectStructure:
         self.__sc.git_checkout(ref_repo, update_http_documentation_arguments.main_branch_name)
         self.__sc.git_push_with_retry(ref_repo, update_http_documentation_arguments.common_remote_name, update_http_documentation_arguments.main_branch_name, update_http_documentation_arguments.main_branch_name)
         self.__sc.git_commit(GeneralUtilities.resolve_relative_path("../..", folder_of_this_file), f"Updated content of {update_http_documentation_arguments.product_name} v{update_http_documentation_arguments.new_project_version} in {update_http_documentation_arguments.reference_repository_name}-submodule")
+
+    @GeneralUtilities.check_arguments
+    def install_requirementstxt_for_codeunit(self,codeunit_folder:str,verbosity:int):
+        self.__sc.install_requirementstxt_file(codeunit_folder+"/Other/requirements.txt", verbosity)
+
+    @GeneralUtilities.check_arguments
+    def install_requirementstxt_for_repository(self, repository_folde: str,verbosity:int):
+        self.__sc.install_requirementstxt_file(repository_folde+"/Other/requirements.txt", verbosity)
+
+    @GeneralUtilities.check_arguments
+    def update_submodule(self, repository_folder: str, submodule_name:str):
+        submodule_folder = GeneralUtilities.resolve_relative_path("Other/Resources/Submodules/"+submodule_name, repository_folder)
+        self.__sc.git_fetch(submodule_folder, "origin")
+        self.__sc.git_checkout(submodule_folder, "main")
+        self.__sc.git_pull(submodule_folder, "origin", "main", "main", True)
+        current_version = self.__sc.get_semver_version_from_gitversion(repository_folder)
+        changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{current_version}.md")
+        if (not os.path.isfile(changelog_file)):
+            GeneralUtilities.ensure_file_exists(changelog_file)
+            GeneralUtilities.write_text_to_file(changelog_file, """# Release notes
+
+## Changes
+
+- Updated geo-ip-database.
+""")

{scriptcollection-3.5.104.dist-info → scriptcollection-3.5.106.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.104
+Version: 3.5.106
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -28,7 +28,7 @@ Requires-Dist: cyclonedx-bom>=5.3.0
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: keyboard>=0.13.5
 Requires-Dist: lcov-cobertura>=2.1.1
-Requires-Dist: lxml>=5.3.1
+Requires-Dist: lxml>=5.3.2
 Requires-Dist: ntplib>=0.4.0
 Requires-Dist: Pillow>=11.1.0
 Requires-Dist: pycdlib>=1.14.0

{scriptcollection-3.5.104.dist-info → scriptcollection-3.5.106.dist-info}/RECORD

@@ -1,16 +1,16 @@
 ScriptCollection/Executables.py,sha256=HI9Pxs5Z9QxPGyqeJU2lWslEggFyGYANCqYVQZp6eJ0,30490
-ScriptCollection/GeneralUtilities.py,sha256=jkJu6y8Wv-j_braS_0zsjF6JzDo46NshMeeAphsXGX4,43848
+ScriptCollection/GeneralUtilities.py,sha256=rjOHLJXHQtYCDSjjWQ45Vs7vzm9C2lEgtyYQ_91TEHU,44043
 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/SCLog.py,sha256=Gw27Oclcb0ten7_89PD5CdNMoO-at2hGUOYbF-x1HPQ,2296
-ScriptCollection/ScriptCollectionCore.py,sha256=08UGdNP-Ji04KIkoG_1Ks7EdbLlSpnM-dI0WBNMzrOc,125705
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=4EcmpWaLxfJHPSW47EXeJivk4hypqPasgbX-joj9isE,229844
+ScriptCollection/ScriptCollectionCore.py,sha256=w5AmB7nLdcgRu5kqfHls95046uRQHqLvWMsywZX4yMA,126071
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=9rO_W6kZiy3Lgov0HeyyDhOwriorMeJXlVDvwZ3S1UE,232511
 ScriptCollection/UpdateCertificates.py,sha256=xRebqD2etBD7ILHL-7fg-Y-kPF0Tbmnwexv4FhwDntQ,7791
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.104.dist-info/METADATA,sha256=oZ-T6ilqqw29o0VDog_vtgJvC7yYrKWd2Tm1PT_BDJE,7664
-scriptcollection-3.5.104.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-scriptcollection-3.5.104.dist-info/entry_points.txt,sha256=fYCGWGNGijBQHhFe6UAO-BEpfEOxLyNJemukt5ElSzs,3644
-scriptcollection-3.5.104.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.104.dist-info/RECORD,,
+scriptcollection-3.5.106.dist-info/METADATA,sha256=n6LYf8sPb9QA50YUjdHf3Sx-ShX9J-_mjl4eJ4RZp4g,7664
+scriptcollection-3.5.106.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+scriptcollection-3.5.106.dist-info/entry_points.txt,sha256=fYCGWGNGijBQHhFe6UAO-BEpfEOxLyNJemukt5ElSzs,3644
+scriptcollection-3.5.106.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.106.dist-info/RECORD,,