ScriptCollection 3.5.21__py3-none-any.whl → 3.5.23__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.21"
+version = "3.5.23"
 __version__ = version
 
 
@@ -204,11 +204,11 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def git_repository_has_unstaged_changes_of_tracked_files(self, repositoryFolder: str):
-        return self.__git_changes_helper(repositoryFolder, ["diff"])
+        return self.__git_changes_helper(repositoryFolder, ["--no-pager", "diff"])
 
     @GeneralUtilities.check_arguments
     def git_repository_has_staged_changes(self, repositoryFolder: str):
-        return self.__git_changes_helper(repositoryFolder, ["diff", "--cached"])
+        return self.__git_changes_helper(repositoryFolder, ["--no-pager", "diff", "--cached"])
 
     @GeneralUtilities.check_arguments
     def git_repository_has_uncommitted_changes(self, repositoryFolder: str) -> bool:
@@ -1071,15 +1071,15 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def get_docker_debian_version(self, image_tag: str) -> str:
-        result = ScriptCollectionCore().run_program_argsasarray(
-            "docker", ['run', f'debian:{image_tag}', 'bash', '-c', 'apt-get -y update && apt-get -y install lsb-release && lsb_release -cs'])
+        result = ScriptCollectionCore().run_program_argsasarray("docker", ['run', f'debian:{image_tag}', 'bash', '-c', 'apt-get -y update && apt-get -y install lsb-release && lsb_release -cs'])
         result_line = GeneralUtilities.string_to_lines(result[1])[-2]
         return result_line
 
     @GeneralUtilities.check_arguments
     def get_latest_tor_version_of_debian_repository(self, debian_version: str) -> str:
         package_url: str = f"https://deb.torproject.org/torproject.org/dists/{debian_version}/main/binary-amd64/Packages"
-        r = requests.get(package_url, timeout=5)
+        headers = {'Cache-Control': 'no-cache'}
+        r = requests.get(package_url, timeout=5, headers=headers)
         if r.status_code != 200:
             raise ValueError(f"Checking for latest tor package resulted in HTTP-response-code {r.status_code}.")
         lines = GeneralUtilities.string_to_lines(GeneralUtilities.bytes_to_string(r.content))
@@ -1095,7 +1095,7 @@ class ScriptCollectionCore:
         GeneralUtilities.ensure_directory_exists(os.path.join(repository_folder, "Other/TestCoverage"))
         coveragefile = os.path.join(repository_folder, "Other/TestCoverage/TestCoverage.xml")
         GeneralUtilities.ensure_file_does_not_exist(coveragefile)
-        os.rename(os.path.join(repository_folder,                "coverage.xml"), coveragefile)
+        os.rename(os.path.join(repository_folder, "coverage.xml"), coveragefile)
 
     @GeneralUtilities.check_arguments
     def get_file_permission(self, file: str) -> str:
@@ -1105,11 +1105,11 @@ class ScriptCollectionCore:
 
     @GeneralUtilities.check_arguments
     def __get_file_permission_helper(self, permissions: str) -> str:
-        return str(self.__to_octet(permissions[0:3]))+str(self.__to_octet(permissions[3:6]))+str(self.__to_octet(permissions[6:9]))
+        return str(self.__to_octet(permissions[0:3])) + str(self.__to_octet(permissions[3:6]))+str(self.__to_octet(permissions[6:9]))
 
     @GeneralUtilities.check_arguments
     def __to_octet(self, string: str) -> int:
-        return int(self.__to_octet_helper(string[0])+self.__to_octet_helper(string[1])+self.__to_octet_helper(string[2]), 2)
+        return int(self.__to_octet_helper(string[0]) + self.__to_octet_helper(string[1])+self.__to_octet_helper(string[2]), 2)
 
     @GeneralUtilities.check_arguments
     def __to_octet_helper(self, string: str) -> str:
@@ -1568,7 +1568,8 @@ DNS                 = {domain}
                 # (something like "cyclonedx-bom>=2.11.0" for example)
                 package = line.split(">")[0]
                 operator = ">=" if ">=" in line else ">"
-                response = requests.get(f'https://pypi.org/pypi/{package}/json', timeout=5)
+                headers = {'Cache-Control': 'no-cache'}
+                response = requests.get(f'https://pypi.org/pypi/{package}/json', timeout=5, headers=headers)
                 latest_version = response.json()['info']['version']
                 # TODO update only minor- and patch-version
                 # TODO print info if there is a new major-version
@@ -1723,7 +1724,8 @@ chmod {permission} {link_file}
         proxies = None
         if GeneralUtilities.string_has_content(proxy):
             proxies = {"http": proxy}
-        response = requests.get('https://ipinfo.io',  proxies=proxies, timeout=5)
+        headers = {'Cache-Control': 'no-cache'}
+        response = requests.get('https://ipinfo.io',  proxies=proxies, timeout=5, headers=headers)
         network_information_as_json_string = GeneralUtilities.bytes_to_string(
             response.content)
         return network_information_as_json_string

ScriptCollection/TasksForCommonProjectStructure.py

@@ -458,6 +458,7 @@ class TasksForCommonProjectStructure:
         GeneralUtilities.ensure_directory_does_not_exist(obj_folder)
         GeneralUtilities.ensure_directory_exists(obj_folder)
         self.__sc.run_program("docfx", "docfx.json", folder_of_current_file, verbosity=verbosity)
+        # TODO generate also a darkmode-variant (darkFX for example, see https://dotnet.github.io/docfx/extensions/templates.html )
         GeneralUtilities.ensure_directory_does_not_exist(obj_folder)
 
     def standardized_task_verify_standard_format_csproj_files(self, codeunit_folder: str) -> bool:
@@ -1276,6 +1277,10 @@ class TasksForCommonProjectStructure:
 
     @GeneralUtilities.check_arguments
     def standardized_tasks_build_for_docker_project(self, build_script_file: str, target_environment_type: str, verbosity: int, commandline_arguments: list[str]) -> None:
+        self.standardized_tasks_build_for_docker_project_with_additional_build_arguments(build_script_file, target_environment_type, verbosity, commandline_arguments, dict[str, str]())
+
+    @GeneralUtilities.check_arguments
+    def standardized_tasks_build_for_docker_project_with_additional_build_arguments(self, build_script_file: str, target_environment_type: str, verbosity: int, commandline_arguments: list[str], custom_arguments: dict[str, str]) -> None:
         use_cache: bool = False
         verbosity = TasksForCommonProjectStructure.get_verbosity_from_commandline_arguments(commandline_arguments, verbosity)
         sc: ScriptCollectionCore = ScriptCollectionCore()
@@ -1283,7 +1288,11 @@ class TasksForCommonProjectStructure:
         codeunit_folder = GeneralUtilities.resolve_relative_path("../..", str(os.path.dirname(build_script_file)))
         codeunitname_lower = codeunitname.lower()
         codeunitversion = self.get_version_of_codeunit(os.path.join(codeunit_folder, f"{codeunitname}.codeunit.xml"))
-        args = ["image", "build", "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={target_environment_type}", "--build-arg", f"Version={codeunitversion}", "--tag", f"{codeunitname_lower}:latest", "--tag", f"{codeunitname_lower}:{codeunitversion}", "--file", f"{codeunitname}/Dockerfile"]
+        args = ["image", "build", "--pull", "--force-rm", "--progress=plain", "--build-arg", f"TargetEnvironmentType={target_environment_type}", "--build-arg", f"Version={codeunitversion}"]
+        for custom_argument_key, custom_argument_value in custom_arguments.items():
+            args.append("--build-arg")
+            args.append(f"{custom_argument_key}={custom_argument_value}")
+        args = args+["--tag", f"{codeunitname_lower}:latest", "--tag", f"{codeunitname_lower}:{codeunitversion}", "--file", f"{codeunitname}/Dockerfile"]
         if not use_cache:
             args.append("--no-cache")
         args.append(".")
@@ -1509,7 +1518,8 @@ class TasksForCommonProjectStructure:
         target_folder = GeneralUtilities.resolve_relative_path("Other/Artifacts/DiffReport", codeunit_folder)
         GeneralUtilities.ensure_directory_does_not_exist(target_folder)
         GeneralUtilities.ensure_directory_exists(target_folder)
-        target_file = os.path.join(target_folder, "DiffReport.html").replace("\\", "/")
+        target_file_light = os.path.join(target_folder, "DiffReport.html").replace("\\", "/")
+        target_file_dark = os.path.join(target_folder, "DiffReportDark.html").replace("\\", "/")
         src = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"  # hash/id of empty git-tree
         src_prefix = "Begin"
         if self.__sc.get_current_git_branch_has_tag(repository_folder):
@@ -1518,7 +1528,15 @@ class TasksForCommonProjectStructure:
             src_prefix = latest_tag
         dst = "HEAD"
         dst_prefix = f"v{current_version}"
-        self.__sc.run_program_argsasarray("sh", ['-c', f'git diff --src-prefix={src_prefix}/ --dst-prefix={dst_prefix}/ {src} {dst} -- {codeunit_name} | pygmentize -l diff -f html -O full -o {target_file} -P style=github-dark'], repository_folder)
+
+        temp_file = os.path.join(tempfile.gettempdir(), str(uuid.uuid4()))
+        try:
+            GeneralUtilities.ensure_file_does_not_exist(temp_file)
+            GeneralUtilities.write_text_to_file(temp_file, self.__sc.run_program("git", f'--no-pager diff --src-prefix={src_prefix}/ --dst-prefix={dst_prefix}/ {src} {dst} -- {codeunit_name}', repository_folder)[1])
+            self.__sc.run_program("pygmentize", f'-l diff -f html -O full -o {target_file_light} -P style=default {temp_file}', repository_folder)
+            self.__sc.run_program("pygmentize", f'-l diff -f html -O full -o {target_file_dark} -P style=github-dark {temp_file}', repository_folder)
+        finally:
+            GeneralUtilities.ensure_file_does_not_exist(temp_file)
 
     @GeneralUtilities.check_arguments
     def get_version_of_project(self, repository_folder: str) -> str:
@@ -2337,7 +2355,8 @@ class TasksForCommonProjectStructure:
         if internet_connection_is_available:  # Load/Update
             GeneralUtilities.ensure_directory_does_not_exist(resource_folder)
             GeneralUtilities.ensure_directory_exists(resource_folder)
-            response = requests.get(f"https://api.github.com/repos/{githubuser}/{githubprojectname}/releases/latest", timeout=5)
+            headers = {'Cache-Control': 'no-cache'}
+            response = requests.get(f"https://api.github.com/repos/{githubuser}/{githubprojectname}/releases/latest", timeout=5, headers=headers)
             latest_version = response.json()["name"]
             filename_on_github = get_filename_on_github(latest_version)
             jar_link = f"https://github.com/{githubuser}/{githubprojectname}/releases/download/{latest_version}/{filename_on_github}"
@@ -2503,7 +2522,11 @@ class TasksForCommonProjectStructure:
 
         GeneralUtilities.write_message_to_stdout('Run "Build.py"...')
         self.__sc.run_program("python", f"Build.py{additional_arguments_b}{general_argument}", build_folder, verbosity=verbosity_for_executed_programs, throw_exception_if_exitcode_is_not_zero=True)
-        self.verify_artifact_exists(codeunit_folder, dict[str, bool]({"BuildResult_.+": True, "BOM": False, "CodeAnalysisResult": False, "SourceCode": True}))
+
+        artifacts = {"BuildResult_.+": True, "BOM": False, "SourceCode": True}
+        if self.codeunit_has_testable_sourcecode(codeunit_file):
+            artifacts["CodeAnalysisResult"] = False
+        self.verify_artifact_exists(codeunit_folder, dict[str, bool](artifacts))
 
         codeunit_hast_testable_sourcecode = self.codeunit_has_testable_sourcecode(codeunit_file)
         if codeunit_hast_testable_sourcecode:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ScriptCollection
-Version: 3.5.21
+Version: 3.5.23
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke
@@ -22,15 +22,15 @@ Classifier: Topic :: Terminals
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: build >=1.2.2
-Requires-Dist: coverage >=7.6.1
-Requires-Dist: cyclonedx-bom >=4.6.1
+Requires-Dist: build >=1.2.2.post1
+Requires-Dist: coverage >=7.6.3
+Requires-Dist: cyclonedx-bom >=5.0.0
 Requires-Dist: defusedxml >=0.7.1
 Requires-Dist: keyboard >=0.13.5
 Requires-Dist: lcov-cobertura >=2.0.2
 Requires-Dist: lxml >=5.3.0
 Requires-Dist: ntplib >=0.4.0
-Requires-Dist: Pillow >=10.4.0
+Requires-Dist: Pillow >=11.0.0
 Requires-Dist: pycdlib >=1.14.0
 Requires-Dist: Pygments >=2.18.0
 Requires-Dist: pylint >=3.3.1

{ScriptCollection-3.5.21.dist-info → ScriptCollection-3.5.23.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=kqV46fmxYIpD7YgI-qNaRKHICwAIj3rFLTlwoUa6Xlw,100364
-ScriptCollection/TasksForCommonProjectStructure.py,sha256=U9OldjgT1BIyvrMkc-TtvswHdRjtkGU2JVZSN7odbJg,190621
+ScriptCollection/ScriptCollectionCore.py,sha256=vuneqSCSk2_JGarQYnkQaxRoiCVWC4MImq48CQlD3ac,100571
+ScriptCollection/TasksForCommonProjectStructure.py,sha256=KHg2a4VmK43t4rvu5co31eCs-erlx7CAyB-__pXnr_Q,192228
 ScriptCollection/UpdateCertificates.py,sha256=Eynbgu7k9jLxApP2D_8Il77B6BFjJap6K7oTeEAZYbk,7790
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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,,
+ScriptCollection-3.5.23.dist-info/METADATA,sha256=hJ0_J1rkQlKy4E0_dXpH5oqbBlqinQ0zDmtaxdCmMz0,7684
+ScriptCollection-3.5.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ScriptCollection-3.5.23.dist-info/entry_points.txt,sha256=yASwR6hWZ_b5d4W49YeX1htD8ngfWbwgjpfQiJdtUAU,2322
+ScriptCollection-3.5.23.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+ScriptCollection-3.5.23.dist-info/RECORD,,

{ScriptCollection-3.5.21.dist-info → ScriptCollection-3.5.23.dist-info}/WHEEL

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