ScriptCollection 4.2.89__py3-none-any.whl → 4.2.90__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/AnionBuildPlatform.py +2 -2
- ScriptCollection/Executables.py +1 -1
- ScriptCollection/GeneralUtilities.py +34 -0
- ScriptCollection/ScriptCollectionCore.py +3 -18
- ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py +1 -1
- ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py +49 -2
- ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py +1 -1
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py +7 -7
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +5 -5
- ScriptCollection/TFCPS/TFCPS_MergeToStable.py +1 -1
- ScriptCollection/TFCPS/TFCPS_Tools_General.py +8 -7
- {scriptcollection-4.2.89.dist-info → scriptcollection-4.2.90.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.89.dist-info → scriptcollection-4.2.90.dist-info}/RECORD +16 -16
- {scriptcollection-4.2.89.dist-info → scriptcollection-4.2.90.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.89.dist-info → scriptcollection-4.2.90.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.89.dist-info → scriptcollection-4.2.90.dist-info}/top_level.txt +0 -0
|
@@ -98,7 +98,7 @@ class AnionBuildPlatform:
|
|
|
98
98
|
# merge_to_main_arguments+=f" --commonremotename {self.__configuration.common_remote_name}"
|
|
99
99
|
if self.__configuration.verbosity is not None:
|
|
100
100
|
merge_to_main_arguments+=f" --verbosity {self.__configuration.verbosity.value}"
|
|
101
|
-
self.__sc.run_program(
|
|
101
|
+
self.__sc.run_program(GeneralUtilities.get_python_executable(),f"MergeToMain.py{merge_to_main_arguments}",scripts_folder,print_live_output=True)
|
|
102
102
|
|
|
103
103
|
merge_to_stable_arguments=""
|
|
104
104
|
#if self.__configuration.project_to_build is not None:
|
|
@@ -127,7 +127,7 @@ class AnionBuildPlatform:
|
|
|
127
127
|
# merge_to_stable_arguments+=f" --commonremoteurl {self.__configuration.common_remote_url}"
|
|
128
128
|
if self.__configuration.verbosity == LogLevel.Debug:
|
|
129
129
|
merge_to_stable_arguments+=f" --verbosity {self.__configuration.verbosity.value}"
|
|
130
|
-
self.__sc.run_program(
|
|
130
|
+
self.__sc.run_program(GeneralUtilities.get_python_executable(),f"MergeToStable.py{merge_to_stable_arguments}",scripts_folder,print_live_output=True)
|
|
131
131
|
|
|
132
132
|
#prepare for next-release
|
|
133
133
|
self.__sc.git_checkout(repository,self.__configuration.source_branch)
|
ScriptCollection/Executables.py
CHANGED
|
@@ -851,7 +851,7 @@ def CreateRelease()->int:
|
|
|
851
851
|
arguments=arguments+" --updatedependencies"
|
|
852
852
|
if args.lazymode:
|
|
853
853
|
arguments=arguments+" --lazymode"
|
|
854
|
-
sc.run_program(
|
|
854
|
+
sc.run_program(GeneralUtilities.get_python_executable(), arguments, scripts_folder,print_live_output=True)
|
|
855
855
|
|
|
856
856
|
return 0
|
|
857
857
|
|
|
@@ -1571,3 +1571,37 @@ class GeneralUtilities:
|
|
|
1571
1571
|
Platform.Linux_ARM64,
|
|
1572
1572
|
Platform.MacOS_ARM64,
|
|
1573
1573
|
]
|
|
1574
|
+
|
|
1575
|
+
@staticmethod
|
|
1576
|
+
@check_arguments
|
|
1577
|
+
def get_scriptcollection_configuration_folder() -> str:
|
|
1578
|
+
result = os.path.join(str(Path.home()), ".ScriptCollection")
|
|
1579
|
+
result = GeneralUtilities.normalize_path(result)
|
|
1580
|
+
GeneralUtilities.ensure_directory_exists(result)
|
|
1581
|
+
return result
|
|
1582
|
+
|
|
1583
|
+
@staticmethod
|
|
1584
|
+
@check_arguments
|
|
1585
|
+
def get_python_executable() -> str:
|
|
1586
|
+
configured_file = os.path.join(GeneralUtilities.get_scriptcollection_configuration_folder(), "PythonExecutable.txt")
|
|
1587
|
+
if os.path.isfile(configured_file):
|
|
1588
|
+
result = GeneralUtilities.read_text_from_file(configured_file).strip()
|
|
1589
|
+
GeneralUtilities.assert_condition(os.path.isfile(result), f"Python executable does not exist: '{result}'")
|
|
1590
|
+
elif GeneralUtilities.string_has_content(sys.executable):
|
|
1591
|
+
result = sys.executable
|
|
1592
|
+
else:
|
|
1593
|
+
result = "python"
|
|
1594
|
+
return result
|
|
1595
|
+
|
|
1596
|
+
@staticmethod
|
|
1597
|
+
@check_arguments
|
|
1598
|
+
def get_docker_executable() -> str:
|
|
1599
|
+
configured_file = os.path.join(GeneralUtilities.get_scriptcollection_configuration_folder(), "DockerExecutable.txt")
|
|
1600
|
+
if os.path.isfile(configured_file):
|
|
1601
|
+
result = GeneralUtilities.read_text_from_file(configured_file).strip()
|
|
1602
|
+
GeneralUtilities.assert_condition(os.path.isfile(result), f"Docker executable does not exist: '{result}'")
|
|
1603
|
+
elif GeneralUtilities.string_has_content(sys.executable):
|
|
1604
|
+
result = sys.executable
|
|
1605
|
+
else:
|
|
1606
|
+
result = "docker"
|
|
1607
|
+
return result
|
|
@@ -39,7 +39,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
|
39
39
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
|
40
40
|
from .SCLog import SCLog, LogLevel
|
|
41
41
|
|
|
42
|
-
version = "4.2.
|
|
42
|
+
version = "4.2.90"
|
|
43
43
|
__version__ = version
|
|
44
44
|
|
|
45
45
|
class VSCodeWorkspaceShellTask:
|
|
@@ -178,14 +178,10 @@ class ScriptCollectionCore:
|
|
|
178
178
|
|
|
179
179
|
@GeneralUtilities.check_arguments
|
|
180
180
|
def get_scriptcollection_configuration_folder(self)->str:
|
|
181
|
-
|
|
182
|
-
result = os.path.join(user_folder, ".ScriptCollection")
|
|
183
|
-
result=GeneralUtilities.normalize_path(result)
|
|
184
|
-
GeneralUtilities.ensure_directory_exists(result)
|
|
185
|
-
return result
|
|
181
|
+
return GeneralUtilities.get_scriptcollection_configuration_folder()
|
|
186
182
|
|
|
187
183
|
def get_global_cache_folder(self)->str:
|
|
188
|
-
result = os.path.join(
|
|
184
|
+
result = os.path.join(GeneralUtilities.get_scriptcollection_configuration_folder(), "GlobalCache")
|
|
189
185
|
result=GeneralUtilities.normalize_path(result)
|
|
190
186
|
GeneralUtilities.ensure_directory_exists(result)
|
|
191
187
|
return result
|
|
@@ -313,17 +309,6 @@ class ScriptCollectionCore:
|
|
|
313
309
|
arg_for_log=f"login {registry} -u {username} -p ***"
|
|
314
310
|
self.run_program("docker",arg,arguments_for_log=arg_for_log,print_live_output=self.log.loglevel==LogLevel.Debug)
|
|
315
311
|
|
|
316
|
-
@GeneralUtilities.check_arguments
|
|
317
|
-
def get_python_executable(self) -> str:
|
|
318
|
-
configured_file = os.path.join(self.get_scriptcollection_configuration_folder(), "PythonExecutable.txt")
|
|
319
|
-
if os.path.isfile(configured_file):
|
|
320
|
-
result = GeneralUtilities.read_text_from_file(configured_file).strip()
|
|
321
|
-
GeneralUtilities.assert_condition(os.path.isfile(result), f"Python executable does not exist: '{result}'")
|
|
322
|
-
elif GeneralUtilities.string_has_content(sys.executable):
|
|
323
|
-
result = sys.executable
|
|
324
|
-
else:
|
|
325
|
-
result = "python"
|
|
326
|
-
return result
|
|
327
312
|
|
|
328
313
|
@GeneralUtilities.check_arguments
|
|
329
314
|
def python_file_has_errors(self, file: str, working_directory: str, treat_warnings_as_errors: bool = True) -> tuple[bool, list[str]]:
|
|
@@ -75,7 +75,7 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
75
75
|
codeunit_version = current_codeunit_version
|
|
76
76
|
self._protected_sc.replace_version_in_dockerfile_file(GeneralUtilities.resolve_relative_path(f"./{codeunitname}/Dockerfile", codeunit_folder), codeunit_version)
|
|
77
77
|
self.do_common_tasks_base(current_codeunit_version)
|
|
78
|
-
self.tfcps_Tools_General.
|
|
78
|
+
self.tfcps_Tools_General.standardized_tasks_update_version_in_docker_examples_if_available(codeunit_folder,codeunit_version)
|
|
79
79
|
|
|
80
80
|
@GeneralUtilities.check_arguments
|
|
81
81
|
def generate_reference(self) -> None:
|
|
@@ -4,6 +4,7 @@ import shutil
|
|
|
4
4
|
import tempfile
|
|
5
5
|
import uuid
|
|
6
6
|
import json
|
|
7
|
+
import csv
|
|
7
8
|
from lxml import etree
|
|
8
9
|
import yaml
|
|
9
10
|
from .CertificateGeneratorInformationBase import CertificateGeneratorInformationBase
|
|
@@ -23,6 +24,7 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
23
24
|
|
|
24
25
|
@GeneralUtilities.check_arguments
|
|
25
26
|
def build(self,runtimes:list[str],generate_open_api_spec:bool) -> None:
|
|
27
|
+
self.__add_custom_nuget_sources()
|
|
26
28
|
if self.is_library:
|
|
27
29
|
self.standardized_tasks_build_for_dotnet_library_project(runtimes)
|
|
28
30
|
GeneralUtilities.assert_condition(not generate_open_api_spec,"OpenAPI-Specification can not be generated for a library.")
|
|
@@ -31,12 +33,57 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
31
33
|
if generate_open_api_spec:
|
|
32
34
|
self.generate_openapi_file(runtimes[0])
|
|
33
35
|
|
|
36
|
+
@GeneralUtilities.check_arguments
|
|
37
|
+
def __add_custom_nuget_sources(self) -> None:
|
|
38
|
+
self._protected_sc.log.log(f"Add custom NuGet-sources from '{csv_file}'...")
|
|
39
|
+
sources:list[tuple[str,str,str,str]] = []
|
|
40
|
+
|
|
41
|
+
csv_file = os.path.join(self._protected_sc.get_scriptcollection_configuration_folder(), "TFCPS", "CustomC#Dependencies.csv")
|
|
42
|
+
if os.path.isfile(csv_file):
|
|
43
|
+
with open(csv_file, encoding="utf-8-sig", newline="") as f:
|
|
44
|
+
reader = csv.DictReader(f)
|
|
45
|
+
for row in reader:
|
|
46
|
+
name = (row.get("Name") or "").strip()
|
|
47
|
+
url = (row.get("Url") or "").strip()
|
|
48
|
+
username = (row.get("Username") or "").strip()
|
|
49
|
+
password = (row.get("Password") or "").strip()
|
|
50
|
+
if not name or not url:
|
|
51
|
+
continue
|
|
52
|
+
sources.append((name, url, username, password))
|
|
53
|
+
|
|
54
|
+
env_name_pattern = re.compile(r"^Dependency_CSharp_(.+?)_Name$")
|
|
55
|
+
for env_var_name, env_var_value in os.environ.items():
|
|
56
|
+
m = env_name_pattern.match(env_var_name)
|
|
57
|
+
if not m:
|
|
58
|
+
continue
|
|
59
|
+
dependency_name = m.group(1)
|
|
60
|
+
name = (env_var_value or "").strip()
|
|
61
|
+
url = (os.environ.get(f"Dependency_CSharp_{dependency_name}_URL") or "").strip()
|
|
62
|
+
username = (os.environ.get(f"Dependency_CSharp_{dependency_name}_Username") or "").strip()
|
|
63
|
+
password = (os.environ.get(f"Dependency_CSharp_{dependency_name}_Passwort") or "").strip()
|
|
64
|
+
if not name or not url:
|
|
65
|
+
continue
|
|
66
|
+
sources.append((name, url, username, password))
|
|
67
|
+
|
|
68
|
+
for name, url, username, password in sources:
|
|
69
|
+
#TODO add only the sources which are needed by the project
|
|
70
|
+
self._protected_sc.log.log(f"Add NuGet-source '{name}' with url '{url}'",LogLevel.Debug)
|
|
71
|
+
args = ["nuget", "add", "source", url, "--name", name]
|
|
72
|
+
if username:
|
|
73
|
+
args += ["--username", username]
|
|
74
|
+
if password:
|
|
75
|
+
args += ["--password", password, "--store-password-in-clear-text"]
|
|
76
|
+
args_for_log = list(args)
|
|
77
|
+
if password:
|
|
78
|
+
args_for_log[args_for_log.index(password)] = "***"
|
|
79
|
+
self._protected_sc.run_program_argsasarray("dotnet", args, arguments_for_log=args_for_log, throw_exception_if_exitcode_is_not_zero=False, print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
80
|
+
|
|
34
81
|
@GeneralUtilities.check_arguments
|
|
35
82
|
def generate_openapi_file(self, runtime: str) -> None:
|
|
36
83
|
swagger_document_name: str = "APISpecification"
|
|
37
84
|
self._protected_sc.log.log("Generate OpenAPI-specification-file...")
|
|
38
|
-
codeunitname =self.get_codeunit_name()
|
|
39
|
-
repository_folder =self.get_repository_folder()
|
|
85
|
+
codeunitname = self.get_codeunit_name()
|
|
86
|
+
repository_folder = self.get_repository_folder()
|
|
40
87
|
codeunit_folder = os.path.join(repository_folder, codeunitname)
|
|
41
88
|
artifacts_folder = os.path.join(codeunit_folder, "Other", "Artifacts")
|
|
42
89
|
GeneralUtilities.ensure_directory_exists(os.path.join(artifacts_folder, "APISpecification"))
|
|
@@ -15,7 +15,7 @@ class TFCPS_CodeUnitSpecific_Python_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
15
15
|
codeunit_folder = self.get_codeunit_folder()
|
|
16
16
|
target_directory = GeneralUtilities.resolve_relative_path("../Artifacts/BuildResult_Wheel", os.path.join(self.get_artifacts_folder()))
|
|
17
17
|
GeneralUtilities.ensure_directory_exists(target_directory)
|
|
18
|
-
self._protected_sc.run_program(
|
|
18
|
+
self._protected_sc.run_program(GeneralUtilities.get_python_executable(), f"-m build --wheel --outdir {target_directory}", codeunit_folder,print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
19
19
|
self.generate_bom_for_python_project( )
|
|
20
20
|
self.copy_source_files_to_output_directory()
|
|
21
21
|
|
|
@@ -52,21 +52,21 @@ class TFCPS_CodeUnit_BuildCodeUnit:
|
|
|
52
52
|
arguments = f"{arguments} --ispremerge"
|
|
53
53
|
|
|
54
54
|
self.sc.log.log("Do common tasks...")
|
|
55
|
-
self.sc.run_program(
|
|
55
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), f"CommonTasks.py {arguments}", os.path.join(self.codeunit_folder, "Other"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
|
|
56
56
|
self.verify_artifact_exists(self.codeunit_folder, dict[str, bool]({"License": True, "DiffReport": True}))
|
|
57
57
|
|
|
58
58
|
self.sc.log.log("Build...")
|
|
59
|
-
self.sc.run_program(
|
|
59
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), f"Build.py {arguments}", os.path.join(self.codeunit_folder, "Other", "Build"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
|
|
60
60
|
artifacts = {"BuildResult_.+": True, "BOM": False, "SourceCode": self.tFCPS_Tools.codeunit_has_testable_sourcecode(codeunit_file)}
|
|
61
61
|
self.verify_artifact_exists(self.codeunit_folder, dict[str, bool](artifacts))
|
|
62
62
|
|
|
63
63
|
if self.tFCPS_Tools.codeunit_has_testable_sourcecode(codeunit_file):
|
|
64
64
|
self.sc.log.log("Run testcases...")
|
|
65
|
-
self.sc.run_program(
|
|
65
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), f"RunTestcases.py {arguments}", os.path.join(self.codeunit_folder, "Other", "QualityCheck"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
|
|
66
66
|
self.verify_artifact_exists(self.codeunit_folder, dict[str, bool]({"TestCoverage": True, "TestCoverageReport": False}))
|
|
67
67
|
|
|
68
68
|
self.sc.log.log("Check for linting-issues...")
|
|
69
|
-
linting_result = self.sc.run_program(
|
|
69
|
+
linting_result = self.sc.run_program(GeneralUtilities.get_python_executable(), f"Linting.py {arguments}", os.path.join(self.codeunit_folder, "Other", "QualityCheck"), print_live_output=self.sc.log.loglevel==LogLevel.Quiet, throw_exception_if_exitcode_is_not_zero=False)
|
|
70
70
|
if linting_result[0] != 0:
|
|
71
71
|
self.sc.log.log("Linting-issues were found.", LogLevel.Warning)
|
|
72
72
|
for line in GeneralUtilities.string_to_lines(linting_result[1]):
|
|
@@ -76,14 +76,14 @@ class TFCPS_CodeUnit_BuildCodeUnit:
|
|
|
76
76
|
|
|
77
77
|
self.sc.log.log("Generate reference...")
|
|
78
78
|
try:
|
|
79
|
-
self.sc.run_program(
|
|
79
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), "GenerateReference.py", os.path.join(self.codeunit_folder, "Other", "Reference"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
|
|
80
80
|
except Exception as e:
|
|
81
81
|
self.sc.log.log_exception(f"Generating reference failed with the following error",e, LogLevel.Warning)
|
|
82
82
|
self.verify_artifact_exists(self.codeunit_folder, dict[str, bool]({"Reference": True}))
|
|
83
83
|
|
|
84
84
|
if os.path.isfile(os.path.join(self.codeunit_folder, "Other", "OnBuildingFinished.py")):
|
|
85
85
|
self.sc.log.log('Finalize building codeunits...')
|
|
86
|
-
self.sc.run_program(
|
|
86
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), f"OnBuildingFinished.py {arguments}", os.path.join(self.codeunit_folder, "Other"), print_live_output=self.sc.log.loglevel==LogLevel.Debug)
|
|
87
87
|
|
|
88
88
|
artifacts_folder = os.path.join(self.codeunit_folder, "Other", "Artifacts")
|
|
89
89
|
artifactsinformation_file = os.path.join(artifacts_folder, f"{self.codeunit_name}.artifactsinformation.xml")
|
|
@@ -132,4 +132,4 @@ class TFCPS_CodeUnit_BuildCodeUnit:
|
|
|
132
132
|
@GeneralUtilities.check_arguments
|
|
133
133
|
def update_dependencies(self) -> None:
|
|
134
134
|
self.sc.log.log("Update dependencies...")
|
|
135
|
-
self.sc.run_program(
|
|
135
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(), "UpdateDependencies.py", os.path.join(self.codeunit_folder, "Other"),print_live_output=True)
|
|
@@ -87,13 +87,13 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
87
87
|
else:
|
|
88
88
|
args=args+["--nocache"]
|
|
89
89
|
|
|
90
|
-
if os.path.isfile( os.path.join(
|
|
90
|
+
if os.path.isfile( os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScript.py")):
|
|
91
91
|
self.sc.log.log("Run custom pre-codeunitbuild script...")
|
|
92
|
-
self.sc.run_program_argsasarray(
|
|
92
|
+
self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["CustomPreCodeUnitBuildScript.py"]+args, os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)
|
|
93
93
|
|
|
94
94
|
if os.path.isfile( os.path.join(self.repository,"Other","Scripts","PrepareBuildCodeunits.py")):
|
|
95
95
|
self.sc.log.log("Prepare build codeunits...")
|
|
96
|
-
self.sc.run_program_argsasarray(
|
|
96
|
+
self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["PrepareBuildCodeunits.py"]+args, os.path.join(self.repository,"Other","Scripts"),print_live_output=True)
|
|
97
97
|
|
|
98
98
|
@GeneralUtilities.check_arguments
|
|
99
99
|
def build_codeunits_in_container(self) -> None:
|
|
@@ -264,7 +264,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
264
264
|
self.sc.assert_no_uncommitted_changes(repository)
|
|
265
265
|
self.run_prepare_script()
|
|
266
266
|
if os.path.isfile(os.path.join(repository,"Other","Scripts","UpdateDependencies.py")):
|
|
267
|
-
self.sc.run_program(
|
|
267
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(),"UpdateDependencies.py",os.path.join(repository,"Other","Scripts"))
|
|
268
268
|
codeunits:list[str]=self.tfcps_tools_general.get_codeunits(repository)
|
|
269
269
|
for codeunit_name in codeunits:
|
|
270
270
|
self.sc.log.log(f"Update dependencies of codeunit {codeunit_name}...")
|
|
@@ -272,7 +272,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
272
272
|
tFCPS_CodeUnit_BuildCodeUnit:TFCPS_CodeUnit_BuildCodeUnit = TFCPS_CodeUnit_BuildCodeUnit(codeunit_folder,self.sc.log.loglevel,"QualityCheck",None,True,False)
|
|
273
273
|
tFCPS_CodeUnit_BuildCodeUnit.build_codeunit()#ensure requirements for updating are there (some programming-languages needs this)
|
|
274
274
|
if self.tfcps_tools_general.codeunit_has_updatable_dependencies(os.path.join(codeunit_folder,f"{codeunit_name}.codeunit.xml")):
|
|
275
|
-
self.sc.run_program(
|
|
275
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(),"UpdateDependencies.py",os.path.join(codeunit_folder,"Other"))
|
|
276
276
|
tFCPS_CodeUnit_BuildCodeUnit.build_codeunit()#check if codeunit is still buildable
|
|
277
277
|
if self.sc.git_repository_has_uncommitted_changes(repository):
|
|
278
278
|
changelog_folder = os.path.join(repository, "Other", "Resources", "Changelog")
|
|
@@ -103,7 +103,7 @@ class TFCPS_MergeToStable:
|
|
|
103
103
|
push_script:str=os.path.join( self.createRelease_configuration.build_repo,"Scripts","CreateRelease",f"PushArtifacts.{codeunit}.py")
|
|
104
104
|
if os.path.isfile(push_script):
|
|
105
105
|
self.sc.log.log(f"Push artifacts of codeunit {codeunit}...")
|
|
106
|
-
self.sc.run_program(
|
|
106
|
+
self.sc.run_program(GeneralUtilities.get_python_executable(),os.path.basename(push_script),os.path.dirname(push_script))
|
|
107
107
|
else:
|
|
108
108
|
self.sc.log.log(f"Codeunit {codeunit} does not have artifacts to push. (Scriptfile \"{push_script}\" does not exist.)",LogLevel.Debug)
|
|
109
109
|
|
|
@@ -1049,16 +1049,17 @@ class TFCPS_Tools_General:
|
|
|
1049
1049
|
return jar_file
|
|
1050
1050
|
|
|
1051
1051
|
@GeneralUtilities.check_arguments
|
|
1052
|
-
def
|
|
1052
|
+
def standardized_tasks_update_version_in_docker_examples_if_available(self, codeunit_folder:str, codeunit_version:str) -> None:
|
|
1053
1053
|
codeunit_name = os.path.basename(codeunit_folder)
|
|
1054
1054
|
codeunit_name_lower = codeunit_name.lower()
|
|
1055
1055
|
examples_folder = GeneralUtilities.resolve_relative_path("Other/Reference/ReferenceContent/Examples", codeunit_folder)
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1056
|
+
if os.path.isdir(examples_folder):
|
|
1057
|
+
for example_folder in GeneralUtilities.get_direct_folders_of_folder(examples_folder):
|
|
1058
|
+
docker_compose_file = os.path.join(example_folder, "docker-compose.yml")
|
|
1059
|
+
if os.path.isfile(docker_compose_file):
|
|
1060
|
+
filecontent = GeneralUtilities.read_text_from_file(docker_compose_file)
|
|
1061
|
+
replaced = re.sub(f'image:\\s+{codeunit_name_lower}:\\d+\\.\\d+\\.\\d+', f"image: {codeunit_name_lower}:{codeunit_version}", filecontent)
|
|
1062
|
+
GeneralUtilities.write_text_to_file(docker_compose_file, replaced)
|
|
1062
1063
|
|
|
1063
1064
|
@GeneralUtilities.check_arguments
|
|
1064
1065
|
def set_version_of_openapigenerator(self, codeunit_folder: str, used_version: str = None) -> None:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.90
|
|
4
4
|
Summary: The ScriptCollection is the place for reusable scripts.
|
|
5
5
|
Author-email: Marius Göcke <marius.goecke@gmail.com>
|
|
6
6
|
Project-URL: Homepage, https://github.com/anionDev/ScriptCollection
|
|
@@ -4,10 +4,10 @@ Other/Build/Build.py,sha256=MLOrQ03XUhtESs3SFhpZAx9Xp1rNXhcRpwGRy1oqecg,330
|
|
|
4
4
|
Other/QualityCheck/Linting.py,sha256=l9TWbo_HOQ1YUn23Kg_ZWDozdPGSwX-du7Haip8_2xQ,342
|
|
5
5
|
Other/QualityCheck/RunTestcases.py,sha256=3vJBquOr9q1DhF4648FhY_sXS-DV_l193mE_O9M7ueM,360
|
|
6
6
|
Other/Reference/GenerateReference.py,sha256=MFzu7U1OHxgecYDi7WSulO8XRGBsgkdqV_r_jkyVF7c,369
|
|
7
|
-
ScriptCollection/AnionBuildPlatform.py,sha256=
|
|
7
|
+
ScriptCollection/AnionBuildPlatform.py,sha256=UcE3uy_Vm9__QVTlP6V4Y7BrhQPQG6hGYrmQ-6rXSPA,11775
|
|
8
8
|
ScriptCollection/CertificateUpdater.py,sha256=dR5JpJDlZdjD4_pgMz7zCrt1IM7VfatmK6pULSczxQw,9693
|
|
9
|
-
ScriptCollection/Executables.py,sha256=
|
|
10
|
-
ScriptCollection/GeneralUtilities.py,sha256=
|
|
9
|
+
ScriptCollection/Executables.py,sha256=5xa9IJ_jsUCQ2qhoSuEghAQwp3F2PTJ7QW5zJwZbEZ8,44815
|
|
10
|
+
ScriptCollection/GeneralUtilities.py,sha256=4BmzJhTPAZmKQd5YlMuX0E5Dl6fhuVkmVaCpST0WzRk,67654
|
|
11
11
|
ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
|
|
12
12
|
ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
|
|
13
13
|
ScriptCollection/ProgramRunnerBase.py,sha256=4A2eQgSg_rRgQcgSi-LYtUlM-uSQEpS7qFWn0tWt4uo,2171
|
|
@@ -15,7 +15,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
15
15
|
ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
|
|
16
16
|
ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
|
|
17
17
|
ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
|
|
18
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
18
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=dzZ_AARsC1GMbDOU0WCR7uQnX-Oz5H_LmAL_-1hb0UA,188349
|
|
19
19
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
20
20
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
|
|
21
21
|
ScriptCollection/OCIImages/OCIImageManager.py,sha256=2muW4hJ_a7EfavY3WVnafqZ0HC87RcZsoTuNvA3c0To,11175
|
|
@@ -31,21 +31,21 @@ ScriptCollection/Resources/CultureChooser/CultureChooser.js,sha256=5-4pwGDq5j1Un
|
|
|
31
31
|
ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcBEtz2gJXmmM14OwTSFtFVRvw,276
|
|
32
32
|
ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
|
|
33
33
|
ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=EMNDgkUem87aH1csz7eoSBBEKkiZMLZqZhnxKSPQWe0,27845
|
|
34
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=
|
|
35
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=
|
|
34
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=SWuYcQ6-dx4HxQ_YaD4MB6VS_5Wv6RVWtfWHcxP3KZw,8461
|
|
35
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=pu_tkLTnX9BcFN9wYSrAmozoqHZb1rLzETK6-yiNUXQ,15926
|
|
36
36
|
ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=yqGstRjRfVVGbqrcBgtYStqth2x2SvBb3y2Ht8GsuMQ,6554
|
|
37
37
|
ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=Tpzgiz6m3-cYCkObZOG5Uu7oM-EMoWFzzRpLl3Lblqo,2023
|
|
38
38
|
ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=-Ev9D3bZDlUk2WFQhcmvzQ3FCS97OdsVUd0koAdmpZc,7474
|
|
39
|
-
ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=
|
|
39
|
+
ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=DL8JrYp4j7cqrhfr7FmRqJ3LWC2Om8nH4eNwQenOLfQ,22195
|
|
40
40
|
ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
|
|
41
|
-
ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=
|
|
41
|
+
ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=3XDCYZb8i3jRXW41Nket25CzOXHwv2xuXaTwtpbGVEU,101354
|
|
42
42
|
ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
43
|
-
ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=
|
|
43
|
+
ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py,sha256=fQgntXxVbqcnEm7KTa_W__dMTU4Ojc9xi9lGAiQLnRs,12250
|
|
44
44
|
ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
45
45
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
|
|
46
46
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
|
|
47
47
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
|
|
48
|
-
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256
|
|
48
|
+
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=-Ov93FTjVHCjKI16waL3fpcbm8zJdVhUi-xDLTTrpIQ,38423
|
|
49
49
|
ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
50
50
|
ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=KAjyFyEjpkghsVPskfsHD68k4Z92gRCT_q6BXfikRwE,7660
|
|
51
51
|
ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -55,7 +55,7 @@ ScriptCollection/TFCPS/Maven/TFCPS_CodeUnitSpecific_Maven.py,sha256=WcWWtCV3GkAk
|
|
|
55
55
|
ScriptCollection/TFCPS/Maven/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
56
56
|
ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=57I7xbLtCtH-Edt1QKCSXF7wnGyAhbGMdghD_VFZIIY,13184
|
|
57
57
|
ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
58
|
-
ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=
|
|
58
|
+
ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=9WwNBBnEWXgZITB-FLRkcjogJ8TKLPE7vjYzFa9S_XE,13693
|
|
59
59
|
ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
60
60
|
ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
61
61
|
ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -291,8 +291,8 @@ build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/TFCPS_Code
|
|
|
291
291
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
292
292
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
293
293
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
294
|
-
scriptcollection-4.2.
|
|
295
|
-
scriptcollection-4.2.
|
|
296
|
-
scriptcollection-4.2.
|
|
297
|
-
scriptcollection-4.2.
|
|
298
|
-
scriptcollection-4.2.
|
|
294
|
+
scriptcollection-4.2.90.dist-info/METADATA,sha256=wwcQ6B1Px4hfSV77fgGJyZC8Lp42ZxWjnNT-tYadJYs,7696
|
|
295
|
+
scriptcollection-4.2.90.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
296
|
+
scriptcollection-4.2.90.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
|
|
297
|
+
scriptcollection-4.2.90.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
298
|
+
scriptcollection-4.2.90.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|