ScriptCollection 4.3.33__py3-none-any.whl → 4.3.35__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/ScriptCollectionCore.py +1 -1
- ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py +15 -0
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +5 -5
- {scriptcollection-4.3.33.dist-info → scriptcollection-4.3.35.dist-info}/METADATA +1 -1
- {scriptcollection-4.3.33.dist-info → scriptcollection-4.3.35.dist-info}/RECORD +8 -8
- {scriptcollection-4.3.33.dist-info → scriptcollection-4.3.35.dist-info}/WHEEL +0 -0
- {scriptcollection-4.3.33.dist-info → scriptcollection-4.3.35.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.3.33.dist-info → scriptcollection-4.3.35.dist-info}/top_level.txt +0 -0
|
@@ -613,6 +613,7 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
613
613
|
GeneralUtilities.ensure_directory_exists(test_working_directory)
|
|
614
614
|
try:
|
|
615
615
|
program_output=self._protected_sc.run_program_argsasarray("dotnet", args, test_working_directory, print_live_output=self.get_verbosity()==LogLevel.Debug, timeoutInSeconds=60*20, env_vars={"MSBUILDDISABLENODEREUSE": "1"})
|
|
616
|
+
test_output:str=program_output[1]
|
|
616
617
|
output_lines=program_output[1].split("\n")
|
|
617
618
|
output_lines=[line for line in output_lines if GeneralUtilities.string_has_content(line)]
|
|
618
619
|
generated_coverage_file: str = output_lines[-1].strip()#the cobertura file is printed in the end of the output by the xplat collector
|
|
@@ -635,7 +636,21 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
635
636
|
if os.path.basename(subfolder).startswith("BuildResultTests_DotNet_"):
|
|
636
637
|
GeneralUtilities.ensure_directory_does_not_exist(subfolder)
|
|
637
638
|
|
|
639
|
+
amount_of_ignored_testcases:int=self.__get_amount_of_ignored_testcases(test_output)
|
|
640
|
+
project_has_ignored_testcases:bool=0<amount_of_ignored_testcases
|
|
641
|
+
if project_has_ignored_testcases:
|
|
642
|
+
raise ValueError(f"Project '{codeunit_name}' has {amount_of_ignored_testcases} ignored testcases.", LogLevel.Warning)
|
|
638
643
|
|
|
644
|
+
@GeneralUtilities.check_arguments
|
|
645
|
+
def __get_amount_of_ignored_testcases(self, test_output: str) -> int:
|
|
646
|
+
# Ignored (=skipped) testcases are counted in the summary-line which dotnet-test prints for each test-project.
|
|
647
|
+
# The summary of the VSTest-runner looks like "Failed: 0, Passed: 3, Skipped: 1, Total: 4" and the summary of the
|
|
648
|
+
# Microsoft-Testing-Platform-runner looks like "total: 4 / failed: 0 / succeeded: 3 / skipped: 1".
|
|
649
|
+
result: int = 0
|
|
650
|
+
for match in re.finditer(r"skipped:\s*(\d+)", test_output, re.IGNORECASE):
|
|
651
|
+
result = result+int(match.group(1))
|
|
652
|
+
return result
|
|
653
|
+
|
|
639
654
|
@GeneralUtilities.check_arguments
|
|
640
655
|
def __remove_unrelated_package_from_testcoverage_file(self, file: str, codeunit_name: str) -> None:
|
|
641
656
|
root: etree._ElementTree = etree.parse(file)
|
|
@@ -163,10 +163,6 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
163
163
|
self.sc.log.log("Prepare build codeunits...")
|
|
164
164
|
self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["PrepareBuildCodeunits.py"]+args, os.path.join(self.repository,"Other","Scripts"),print_live_output=True)
|
|
165
165
|
|
|
166
|
-
@GeneralUtilities.check_arguments
|
|
167
|
-
def build_codeunits_in_a_local_container(self) -> tuple[bool, str]:#TODO remove this
|
|
168
|
-
return self.build_codeunits_in_container()
|
|
169
|
-
|
|
170
166
|
@GeneralUtilities.check_arguments
|
|
171
167
|
def build_codeunits_in_container(self,base_mount_folder:str) -> tuple[bool, str]:
|
|
172
168
|
#base_mount_folder is assumed to be an absolute path set correctly by the caller (see BuildCodeUnitsC in Executables.py, which defaults it to the repository itself).
|
|
@@ -431,7 +427,11 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
431
427
|
|
|
432
428
|
@GeneralUtilities.check_arguments
|
|
433
429
|
def add_ready_to_merge_flag(self) -> bool:
|
|
434
|
-
|
|
430
|
+
if self.__add_ready_to_merge_flag:
|
|
431
|
+
return True
|
|
432
|
+
if self.sc.git_get_current_branch_name(self.repository)=="other/maintenance":
|
|
433
|
+
return True
|
|
434
|
+
return False
|
|
435
435
|
|
|
436
436
|
@GeneralUtilities.check_arguments
|
|
437
437
|
def update_dependencies(self) -> None:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.3.
|
|
3
|
+
Version: 4.3.35
|
|
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
|
|
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
9
9
|
ScriptCollection/ProgramRunnerPopen.py,sha256=zVD-gZY85o8wiGFcpYAGNDl-tXaKzipl1Bkhqy2ois4,4681
|
|
10
10
|
ScriptCollection/ProgramRunnerSudo.py,sha256=RXsiceQ8W6a8YDk_2BPscVbIAmDIpIxqe9WHBy2r4CM,5233
|
|
11
11
|
ScriptCollection/SCLog.py,sha256=LdzSJy3NnnwYCCefz2h4tiTy4BjT8lOz3IBG_bMOg9E,4821
|
|
12
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
12
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=U09nz6LRvoIBNLV0vFMYLh6CLUllQjOAQCsZNhE-fxg,246436
|
|
13
13
|
ScriptCollection/UnassignedVariablesCheck.py,sha256=v59qLQ5RRvx31ouuCW7NWZj3McWENvGBPkV5ZGBmqJE,4344
|
|
14
14
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
15
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=WO2M28c2tUwsXFNa2L9zqMhdlyObWm3qpPE0LdIs7SE,2315
|
|
@@ -35,7 +35,7 @@ ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz
|
|
|
35
35
|
ScriptCollection/TFCPS/SCTaskRunnerServer.py,sha256=rpuwSsQ6YQfZS2LGnvOH5ql8zs_-cHU4LQttS7XNT60,11272
|
|
36
36
|
ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=H9FWlS6BPK-UWJXdWN686ePky4Hq-Q13T0Kx8HSJu7s,34990
|
|
37
37
|
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=Ll5EOkpVpPiFrM2mLeQXolaF7075IwgtnHXvfdpkH4k,9904
|
|
38
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=
|
|
38
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=fbCwM-eRcdCtXWx__48E43fT55rXBXag5_jWSgdeIz4,30218
|
|
39
39
|
ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=X2NgZgbOkJsdZ6wMHB_RuS_rQCuz5oQCqzYrxyXBN9Q,6680
|
|
40
40
|
ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=5vCFfDiU8bvfcnoKNs2ATS8nsl6mYXcIuX7XfYE0tvg,2116
|
|
41
41
|
ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=zp7n0Li7GTi4tERDMgDcJ-o3m6131m31zvkat0lALEc,7781
|
|
@@ -49,7 +49,7 @@ ScriptCollection/TFCPS/Docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
|
|
|
49
49
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationBase.py,sha256=bT6Gd5pQpZCw4OQz6HWkPCSn5z__eUUEisABLDSxd0o,200
|
|
50
50
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=QyjOfMY22JWCvKjMelHiDWbJiWqotOfebpJpgDUaoO4,237
|
|
51
51
|
ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
|
|
52
|
-
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=
|
|
52
|
+
ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=tQ2kOaoj-HjFGfcrJ0aekefn5iJhsKmu2ry1vGg_aVA,46578
|
|
53
53
|
ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
54
54
|
ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=d8U-sIhsneMplYkG73BJRQQZh4uLoX7QiOhbnZNuOM8,8540
|
|
55
55
|
ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -63,8 +63,8 @@ ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=Bd1gxCk9Fb
|
|
|
63
63
|
ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
64
64
|
ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
65
65
|
ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
66
|
-
scriptcollection-4.3.
|
|
67
|
-
scriptcollection-4.3.
|
|
68
|
-
scriptcollection-4.3.
|
|
69
|
-
scriptcollection-4.3.
|
|
70
|
-
scriptcollection-4.3.
|
|
66
|
+
scriptcollection-4.3.35.dist-info/METADATA,sha256=WKOYwBJ_s-tWqB3y4ShwEq8X9HNL4VawcG2MdrproHE,7816
|
|
67
|
+
scriptcollection-4.3.35.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
|
|
68
|
+
scriptcollection-4.3.35.dist-info/entry_points.txt,sha256=Iq9YMSTWNCAJpBzM5L9CQx80tL9-XUu6MzDRAdBrIPg,5875
|
|
69
|
+
scriptcollection-4.3.35.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
70
|
+
scriptcollection-4.3.35.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|