ScriptCollection 4.2.106__py3-none-any.whl → 4.2.108__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 -2
- ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py +1 -2
- ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py +13 -7
- {scriptcollection-4.2.106.dist-info → scriptcollection-4.2.108.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.106.dist-info → scriptcollection-4.2.108.dist-info}/RECORD +8 -8
- {scriptcollection-4.2.106.dist-info → scriptcollection-4.2.108.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.106.dist-info → scriptcollection-4.2.108.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.106.dist-info → scriptcollection-4.2.108.dist-info}/top_level.txt +0 -0
|
@@ -13,7 +13,6 @@ import zipfile
|
|
|
13
13
|
import math
|
|
14
14
|
import base64
|
|
15
15
|
import os
|
|
16
|
-
import sys
|
|
17
16
|
from html.parser import HTMLParser
|
|
18
17
|
from queue import Queue, Empty
|
|
19
18
|
from concurrent.futures import ThreadPoolExecutor
|
|
@@ -39,7 +38,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
|
39
38
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
|
40
39
|
from .SCLog import SCLog, LogLevel
|
|
41
40
|
|
|
42
|
-
version = "4.2.
|
|
41
|
+
version = "4.2.108"
|
|
43
42
|
__version__ = version
|
|
44
43
|
|
|
45
44
|
class VSCodeWorkspaceShellTask:
|
|
@@ -250,7 +250,7 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
250
250
|
curl_arguments="--fail --silent --show-error --max-time 30"
|
|
251
251
|
if use_https_for_test:
|
|
252
252
|
curl_arguments=curl_arguments+" --insecure"
|
|
253
|
-
self._protected_sc.run_program("docker",f"run --rm --network {network_name} --entrypoint curl {curl_image} {curl_arguments}
|
|
253
|
+
self._protected_sc.run_program("docker",f"run --rm --network {network_name} --entrypoint curl {curl_image} {curl_arguments} {url}")
|
|
254
254
|
return (True,None)
|
|
255
255
|
except Exception as e:
|
|
256
256
|
last_exception=e
|
|
@@ -271,7 +271,6 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
271
271
|
return (False,f"Container \"{container_name}\" is not working properly.{exception_message}{container_output}")
|
|
272
272
|
finally:
|
|
273
273
|
self.tfcps_Tools_General.ensure_containers_are_not_running([container_name])
|
|
274
|
-
self._protected_sc.ensure_local_docker_network_does_not_exist(network_name)
|
|
275
274
|
|
|
276
275
|
@GeneralUtilities.check_arguments
|
|
277
276
|
def verify_image_is_working_via_network(self,timeout:timedelta,environment_variables:dict[str,str],container_port:int,http_test_route:str,use_https_for_test:bool,network_name:str):
|
|
@@ -243,7 +243,19 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
243
243
|
nupkg_file = f"{build_folder}/{nupkg_filename}"
|
|
244
244
|
GeneralUtilities.ensure_file_does_not_exist(nupkg_file)
|
|
245
245
|
commit_id = self._protected_sc.git_get_commit_id(repository_folder)
|
|
246
|
-
|
|
246
|
+
nuspec_file = os.path.join(build_folder, f"{codeunitname}.nuspec")
|
|
247
|
+
# Pack the hand-written nuspec using "dotnet pack" (the classic "nuget pack" is not available in the dotnet-only build-container).
|
|
248
|
+
# With NuspecFile the package-content is taken entirely from the nuspec's <files>-list, so no rebuild happens here (the library was already built before).
|
|
249
|
+
self._protected_sc.run_program_argsasarray("dotnet", [
|
|
250
|
+
"pack", self.csproj_file,
|
|
251
|
+
"-c", self.get_target_environment_type(),
|
|
252
|
+
"--no-build", "--no-restore",
|
|
253
|
+
"--output", build_folder,
|
|
254
|
+
f"-p:NuspecFile={nuspec_file}",
|
|
255
|
+
f"-p:NuspecBasePath={build_folder}",
|
|
256
|
+
f"-p:NuspecProperties=commitid={commit_id}",
|
|
257
|
+
"-p:IsPackable=true",
|
|
258
|
+
], build_folder, print_live_output=self.get_verbosity()==LogLevel.Debug)
|
|
247
259
|
GeneralUtilities.ensure_directory_does_not_exist(outputfolder)
|
|
248
260
|
GeneralUtilities.ensure_directory_exists(outputfolder)
|
|
249
261
|
os.rename(nupkg_file, f"{outputfolder}/{nupkg_filename}")
|
|
@@ -579,12 +591,6 @@ class TFCPS_CodeUnitSpecific_DotNet_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
579
591
|
result = etree.tostring(root).decode("utf-8")
|
|
580
592
|
GeneralUtilities.write_text_to_file(file, result)
|
|
581
593
|
|
|
582
|
-
@GeneralUtilities.check_arguments
|
|
583
|
-
def __coverage_file_contains_sources_and_packages(self, file: str) -> bool:
|
|
584
|
-
root: etree._ElementTree = etree.parse(file)
|
|
585
|
-
sources = root.xpath("//coverage/sources/source/text()")
|
|
586
|
-
packages = root.xpath("//coverage/packages/package")
|
|
587
|
-
return len(sources) > 0 and len(packages) > 0
|
|
588
594
|
|
|
589
595
|
@GeneralUtilities.check_arguments
|
|
590
596
|
def __standardized_tasks_run_testcases_for_dotnet_project_helper(self, source: str, codeunit_folder: str, match: re.Match) -> str:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.108
|
|
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
|
|
@@ -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=akNckNLynVAPNEvKiTBFgD1WHoHnPsifTe8tIdP3o6Y,188782
|
|
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
|
|
@@ -40,12 +40,12 @@ ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=xVPer8EGH5vhTT3_mpTMJJxWLB3
|
|
|
40
40
|
ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
|
|
41
41
|
ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=l42hYiDwcafEGIUCXmeyxr7XMzQ01MUEpElVvB1zhKY,105372
|
|
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=jFH8IQ2jmgqVV5Zio9vCvw-OuQgI4DxgM1ahNDkupIw,19577
|
|
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=np81FkrwBSIfQmSnFhMmDqY6QgJL6BsYK7GKB9v-F8w,40718
|
|
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
|
|
@@ -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.108.dist-info/METADATA,sha256=IoDdf_vncKZFl7MEV_kf-T3nSOJsq4HXenpmCWysbBA,7697
|
|
295
|
+
scriptcollection-4.2.108.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
296
|
+
scriptcollection-4.2.108.dist-info/entry_points.txt,sha256=_vnVTrGJc_z-DTPLvaYyyOpDEQLz0bdO2OLN3_ZmeR8,4978
|
|
297
|
+
scriptcollection-4.2.108.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
298
|
+
scriptcollection-4.2.108.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|