ScriptCollection 3.5.111__py3-none-any.whl → 3.5.113__py3-none-any.whl

ScriptCollection/Executables.py

@@ -631,7 +631,6 @@ def CurrentUserHasElevatedPrivileges() -> int:
 
 
 def Espoc() -> int:
-    GeneralUtilities.write_message_to_stdout("check...")
     parser = argparse.ArgumentParser(description="Espoc (appreviation for 'exit started programs on close') is a tool to ensure the started processes of your program will also get terminated when the execution of your program is finished.")
     parser.add_argument('-p', '--processid', required=True)
     parser.add_argument('-f', '--file', required=True, help='Specifies the file where the process-ids of the started processes are stored (line by line). This file will be deleted when all started processes are terminated.')

ScriptCollection/SCLog.py

@@ -38,6 +38,8 @@ class SCLog:
 
         if loglevel == LogLevel.Warning:
             message = f"Warning: {message}"
+        if loglevel == LogLevel.Debug:
+            message = f"Debug: {message}"
         if self.add_overhead:
             if loglevel == LogLevel.Error:
                 message = f"[Error] {message}"

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.111"
+version = "3.5.113"
 __version__ = version
 
 

ScriptCollection/TasksForCommonProjectStructure.py

@@ -862,7 +862,7 @@ class TasksForCommonProjectStructure:
         if os.path.isfile(os.path.join(codeunit_folder, runsettings_file)):
             arg = f"{arg} --settings {runsettings_file}"
         arg = f"{arg} /p:CollectCoverage=true /p:CoverletOutput=../Other/Artifacts/TestCoverage/Testcoverage /p:CoverletOutputFormat=cobertura"
-        self.__sc.run_program("dotnet", arg, codeunit_folder, verbosity=verbosity,print_live_output=True)
+        self.__sc.run_program("dotnet", arg, codeunit_folder, verbosity=verbosity, print_live_output=True)
         target_file = os.path.join(coverage_file_folder,  "TestCoverage.xml")
         GeneralUtilities.ensure_file_does_not_exist(target_file)
         os.rename(os.path.join(coverage_file_folder,  "Testcoverage.cobertura.xml"), target_file)
@@ -2422,7 +2422,7 @@ class TasksForCommonProjectStructure:
                 GeneralUtilities.write_text_to_file(docker_compose_file, replaced)
 
     @GeneralUtilities.check_arguments
-    def start_dockerfile_example(self, current_file: str, verbosity: int, remove_old_container: bool, remove_volumes_folder: bool, commandline_arguments: list[str]) -> None:
+    def start_dockerfile_example(self, current_file: str, verbosity: int, remove_old_container: bool, remove_volumes_folder: bool, commandline_arguments: list[str], env_file: str) -> None:
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         folder = os.path.dirname(current_file)
         example_name = os.path.basename(folder)
@@ -2438,7 +2438,7 @@ class TasksForCommonProjectStructure:
                     container_names.append(match.group(1))
             GeneralUtilities.write_message_to_stdout(f"Ensure container of {docker_compose_file} do not exist...")
             for container_name in container_names:
-                GeneralUtilities.write_message_to_stdout(f"Ensure container of {container_name} does not exist")
+                GeneralUtilities.write_message_to_stdout(f"Ensure container {container_name} does not exist...")
                 self.__sc.run_program("docker", f"container rm -f {container_name}", oci_image_artifacts_folder, verbosity=0, throw_exception_if_exitcode_is_not_zero=False)
         if remove_volumes_folder:
             volumes_folder = os.path.join(folder, "Volumes")
@@ -2449,7 +2449,21 @@ class TasksForCommonProjectStructure:
         self.__sc.run_program("docker", f"load -i {image_filename}", oci_image_artifacts_folder, verbosity=verbosity)
         docker_project_name = f"{codeunit_name}_{example_name}".lower()
         GeneralUtilities.write_message_to_stdout("Start docker-container...")
-        self.__sc.run_program("docker", f"compose --project-name {docker_project_name} up --detach", folder, verbosity=verbosity)
+        argument = f"compose --project-name {docker_project_name}"
+        if env_file is not None:
+            argument = f"{argument} --env-file {env_file}"
+        argument = f"{argument} up --detach"
+        self.__sc.run_program("docker", argument, folder, verbosity=verbosity)
+
+    @GeneralUtilities.check_arguments
+    def ensure_env_file_is_generated(self, current_file: str, env_file_name: str, env_values: dict[str, str]):
+        folder = os.path.dirname(current_file)
+        env_file = os.path.join(folder, env_file_name)
+        if not os.path.isfile(env_file):
+            lines = []
+            for key, value in env_values.items():
+                lines.append(f"{key}={value}")
+            GeneralUtilities.write_lines_to_file(env_file, lines)
 
     @GeneralUtilities.check_arguments
     def stop_dockerfile_example(self, current_file: str, verbosity: int, remove_old_container: bool, remove_volumes_folder: bool, commandline_arguments: list[str]) -> None:
@@ -2553,7 +2567,7 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def build_specific_codeunits(self, repository_folder: str, codeunits: list[str], verbosity: int = 1, target_environmenttype: str = "QualityCheck", additional_arguments_file: str = None, is_pre_merge: bool = False, export_target_directory: str = None, assume_dependent_codeunits_are_already_built: bool = True, commandline_arguments: list[str] = [], do_git_clean_when_no_changes: bool = False, note: str = None, check_for_new_files: bool = True) -> None:
-        codeunits_list = "{"+", ".join(["a","b"])+"}"
+        codeunits_list = "{"+", ".join(["a", "b"])+"}"
         if verbosity > 2:
             GeneralUtilities.write_message_to_stdout(f"Start building codeunits ({codeunits_list}) in repository '{repository_folder}'...")
         self.__sc.assert_is_git_repository(repository_folder)
@@ -3100,6 +3114,7 @@ class TasksForCommonProjectStructure:
         update_dependencies_script_filename = "UpdateDependencies.py"
         target_environmenttype = "QualityCheck"
         self.build_codeunits(repository_folder, target_environmenttype=target_environmenttype, do_git_clean_when_no_changes=True, note="Prepare dependency-update")  # Required because update dependencies is not always possible for not-buildet codeunits (depends on the programming language or package manager)
+        GeneralUtilities.assert_condition(not self.__sc.git_repository_has_uncommitted_changes(repository_folder), "There are uncommitted changes in the repository.")
 
         # update dependencies of resources
         global_scripts_folder = os.path.join(repository_folder, "Other", "Scripts")
@@ -3107,6 +3122,7 @@ class TasksForCommonProjectStructure:
             self.__sc.run_program("python", update_dependencies_script_filename, global_scripts_folder, print_live_output=True)
 
         # update dependencies of codeunits
+        something_was_updated = False
         for codeunit in codeunits:
             codeunit_file = os.path.join(repository_folder, codeunit, f"{codeunit}.codeunit.xml")
             codeunit_has_updatable_dependencies = self.codeunit_has_updatable_dependencies(codeunit_file)
@@ -3116,6 +3132,7 @@ class TasksForCommonProjectStructure:
                 GeneralUtilities.ensure_directory_exists(os.path.join(update_dependencies_script_folder, "Resources", "CodeAnalysisResult"))
                 self.__sc.run_program("python", update_dependencies_script_filename, update_dependencies_script_folder, verbosity, print_live_output=True)
                 if self.__sc.git_repository_has_uncommitted_changes(repository_folder):
+                    something_was_updated = True
                     version_of_project = self.get_version_of_project(repository_folder)
                     changelog_file = os.path.join(repository_folder, "Other", "Resources", "Changelog", f"v{version_of_project}.md")
                     if not os.path.isfile(changelog_file):
@@ -3128,8 +3145,10 @@ class TasksForCommonProjectStructure:
                         GeneralUtilities.write_message_to_stdout(f"Updated dependencies in codeunit {codeunit}.")
                 else:
                     GeneralUtilities.write_message_to_stdout(f"There are no dependencies to update in codeunit {codeunit}.")
-                self.build_specific_codeunits(repository_folder, [codeunit], 0, target_environmenttype, None, False, None, True, [], False, f"Build codeunit {codeunit} due to updated dependencies", False)
-        self.__sc.git_commit(repository_folder, "Updated dependencies")
+
+        if something_was_updated:
+            self.build_codeunits(repository_folder, verbosity, "QualityCheck", None, False, None, False, f"Build codeunits due to updated dependencies")
+            self.__sc.git_commit(repository_folder, "Updated dependencies")
 
     class GenericPrepareNewReleaseArguments:
         current_file: str

{scriptcollection-3.5.111.dist-info → scriptcollection-3.5.113.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.111
+Version: 3.5.113
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -34,7 +34,7 @@ Requires-Dist: Pillow>=11.2.1
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pycdlib>=1.14.0
 Requires-Dist: Pygments>=2.19.1
-Requires-Dist: pylint>=3.3.6
+Requires-Dist: pylint>=3.3.7
 Requires-Dist: pyOpenSSL>=25.0.0
 Requires-Dist: PyPDF>=5.4.0
 Requires-Dist: pytest>=8.3.5

scriptcollection-3.5.113.dist-info/RECORD

@@ -0,0 +1,16 @@
+ScriptCollection/CertificateUpdater.py,sha256=pJopWFcwaLAEVljtC4O3SVrlpIpoJNUhT1V4mgiqLvE,8970
+ScriptCollection/Executables.py,sha256=ht-RZFu4g34Sr09b_L0c2QpKcjLWX-wFtKSMDMZYqsw,32266
+ScriptCollection/GeneralUtilities.py,sha256=VO4a7xctkjN5dcBXc32gz0x9U07DEagasjvYVKqLmdM,44173
+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=5qjOBYiliyHV57GY8Y5dgUek512EVI8AzBF288R4fn4,2377
+ScriptCollection/ScriptCollectionCore.py,sha256=T-vQigYR2Hegx1jdJAUmtZQNHNYHh8b5O7eN9HUto8o,130404
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=14bNm3n6CFJFy5exs2u7HnmhSAcxoi5rRIxGhcA1GJk,233800
+ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+scriptcollection-3.5.113.dist-info/METADATA,sha256=9hTK1v1KaZuVoFoANgJeBMH4HHJKDU27S_GGbo8DKs8,7694
+scriptcollection-3.5.113.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+scriptcollection-3.5.113.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.113.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.113.dist-info/RECORD,,

{scriptcollection-3.5.111.dist-info → scriptcollection-3.5.113.dist-info}/WHEEL

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

scriptcollection-3.5.111.dist-info/RECORD

@@ -1,16 +0,0 @@
-ScriptCollection/CertificateUpdater.py,sha256=pJopWFcwaLAEVljtC4O3SVrlpIpoJNUhT1V4mgiqLvE,8970
-ScriptCollection/Executables.py,sha256=0etPIuxWj8sCmlfZbAA_gfWm1SEIj6JH9guOaeAu8tM,32323
-ScriptCollection/GeneralUtilities.py,sha256=VO4a7xctkjN5dcBXc32gz0x9U07DEagasjvYVKqLmdM,44173
-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=xjnY8CpNteFAsEtMY3Xo-qIsLBRSQZVGiguGt2Nj_I4,130404
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=5GnI89wwy8_uJH_pZtd0zgZ1C0ReIrZeePjUIwo2sus,232910
-ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.111.dist-info/METADATA,sha256=-LRurzfB1ZIFSh09oKjTiDm6PynnxtKk0PGf5uodYGc,7694
-scriptcollection-3.5.111.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-scriptcollection-3.5.111.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.111.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.111.dist-info/RECORD,,