ScriptCollection 4.2.100__py3-none-any.whl → 4.2.102__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/Executables.py +4 -4
- ScriptCollection/ScriptCollectionCore.py +1 -1
- ScriptCollection/TFCPS/Docker/TFCPS_CodeUnitSpecific_Docker.py +1 -2
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +2 -2
- ScriptCollection/TFCPS/TFCPS_MergeToMain.py +1 -1
- ScriptCollection/TFCPS/TFCPS_MergeToStable.py +1 -1
- {scriptcollection-4.2.100.dist-info → scriptcollection-4.2.102.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.100.dist-info → scriptcollection-4.2.102.dist-info}/RECORD +11 -11
- {scriptcollection-4.2.100.dist-info → scriptcollection-4.2.102.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.100.dist-info → scriptcollection-4.2.102.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.100.dist-info → scriptcollection-4.2.102.dist-info}/top_level.txt +0 -0
ScriptCollection/Executables.py
CHANGED
|
@@ -259,7 +259,7 @@ def BuildCodeUnits() -> int:
|
|
|
259
259
|
parser.add_argument('-a','--additionalargumentsfile', required=False, default=None)
|
|
260
260
|
parser.add_argument("-c",'--nocache', required=False, default=False, action='store_true')
|
|
261
261
|
parser.add_argument('-p','--ispremerge', required=False, default=False, action='store_true')
|
|
262
|
-
parser.add_argument('-
|
|
262
|
+
parser.add_argument('-u','--assertnonewchanges', required=False, default=False, action='store_true')
|
|
263
263
|
|
|
264
264
|
args = parser.parse_args()
|
|
265
265
|
|
|
@@ -282,12 +282,12 @@ def BuildCodeUnitsC() -> int:
|
|
|
282
282
|
parser.add_argument("-c",'--nocache', required=False, default=False, action='store_true')
|
|
283
283
|
parser.add_argument('-p','--ispremerge', required=False, default=False, action='store_true')
|
|
284
284
|
parser.add_argument('--image', required=False, default="scbuilder:latest")
|
|
285
|
-
parser.add_argument('-
|
|
285
|
+
parser.add_argument('-u','--assertnonewchanges', required=False, default=False, action='store_true')
|
|
286
286
|
args = parser.parse_args()
|
|
287
287
|
GeneralUtilities.reconfigure_standard_input_and_outputs()
|
|
288
288
|
repo:str=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
|
|
289
289
|
verbosity=LogLevel(int(args.verbosity))
|
|
290
|
-
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,args.ispremerge,args.
|
|
290
|
+
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,args.ispremerge,args.assertnonewchanges)
|
|
291
291
|
t.build_codeunits_in_container()
|
|
292
292
|
return 1#TODO
|
|
293
293
|
|
|
@@ -302,7 +302,7 @@ def UpdateDependencies() -> int:
|
|
|
302
302
|
args = parser.parse_args()
|
|
303
303
|
verbosity=LogLevel(int(args.verbosity))
|
|
304
304
|
repo:str=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
|
|
305
|
-
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,False,False)
|
|
305
|
+
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,False,False,False)
|
|
306
306
|
t.update_dependencies()
|
|
307
307
|
return 0
|
|
308
308
|
|
|
@@ -60,8 +60,7 @@ class TFCPS_CodeUnitSpecific_Docker_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
60
60
|
sbom_folder = os.path.join(artifacts_folder, "BOM")
|
|
61
61
|
codeunitversion = self.tfcps_Tools_General.get_version_of_codeunit(self.get_codeunit_file())
|
|
62
62
|
GeneralUtilities.ensure_directory_exists(sbom_folder)
|
|
63
|
-
|
|
64
|
-
self._protected_sc.run_program_argsasarray("docker", ["run","--rm","-v","/var/run/docker.sock:/var/run/docker.sock","-v","./BOM:/BOM",self.tfcps_Tools_General.oci_image_manager.get_registry_address_for_image_with_default_tag(self.get_repository_folder(),"Syft",True),f"{codeunitname_lower}:{codeunitversion}","-o",f"cyclonedx-xml=/BOM/{codeunitname}.{codeunitversion}.sbom.xml"], artifacts_folder, print_errors_as_information=True)
|
|
63
|
+
self._protected_sc.run_program_argsasarray("docker", ["run","--rm","-v","/var/run/docker.sock:/var/run/docker.sock","-v","./BOM:/BOM",self.tfcps_Tools_General.oci_image_manager.get_registry_address_for_image_with_default_tag(self.get_repository_folder(),"Syft",True),f"{codeunitname_lower}:{codeunitversion}","-o",f"cyclonedx-xml=./BOM/{codeunitname}.{codeunitversion}.sbom.xml"], artifacts_folder, print_errors_as_information=True)
|
|
65
64
|
self._protected_sc.format_xml_file(sbom_folder+f"/{codeunitname}.{codeunitversion}.sbom.xml")
|
|
66
65
|
|
|
67
66
|
@GeneralUtilities.check_arguments
|
|
@@ -78,7 +78,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
78
78
|
|
|
79
79
|
if self.__assert_no_new_changes:
|
|
80
80
|
self.sc.assert_no_uncommitted_changes(self.repository,"There are new uncommitted changes in the repository.")
|
|
81
|
-
|
|
81
|
+
|
|
82
82
|
end_time:datetime=GeneralUtilities.get_now()
|
|
83
83
|
duration=end_time-start_time
|
|
84
84
|
self.sc.log.log(f"Finished building codeunits at {GeneralUtilities.datetime_to_string_for_readable_entry(end_time,False)}. (Duration: {GeneralUtilities.timedelta_to_simple_string(duration)})")
|
|
@@ -288,7 +288,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
288
288
|
changelog_file = os.path.join(changelog_folder, f"v{project_version}.md")
|
|
289
289
|
if not os.path.isfile(changelog_file):
|
|
290
290
|
self.__ensure_changelog_file_is_added(repository, project_version)
|
|
291
|
-
t=TFCPS_CodeUnit_BuildCodeUnits(repository,self.sc.log.loglevel,"QualityCheck",None,True,False)
|
|
291
|
+
t=TFCPS_CodeUnit_BuildCodeUnits(repository,self.sc.log.loglevel,"QualityCheck",None,True,False,False)
|
|
292
292
|
t.build_codeunits()#check codeunits are buildable at all
|
|
293
293
|
self.sc.git_commit(repository, "Updated dependencies", stage_all_changes=True)
|
|
294
294
|
|
|
@@ -61,7 +61,7 @@ class TFCPS_MergeToMain:
|
|
|
61
61
|
#premerge-build
|
|
62
62
|
#TODO the premerge-build is now supposed to be in MergeToStable
|
|
63
63
|
try:
|
|
64
|
-
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.generic_prepare_new_release_arguments.repository_folder,self.sc.log.loglevel,"QualityCheck",self.generic_prepare_new_release_arguments.additional_arguments_file,False,True)
|
|
64
|
+
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.generic_prepare_new_release_arguments.repository_folder,self.sc.log.loglevel,"QualityCheck",self.generic_prepare_new_release_arguments.additional_arguments_file,False,True,False)
|
|
65
65
|
tfcps_CodeUnit_BuildCodeUnits.build_codeunits()
|
|
66
66
|
except Exception:
|
|
67
67
|
self.sc.log.log(f"Branch {source_branch} is not buildable.",LogLevel.Error)
|
|
@@ -76,7 +76,7 @@ class TFCPS_MergeToStable:
|
|
|
76
76
|
product_version:str=self.tFCPS_Tools_General.get_version_of_project(self.createRelease_configuration.repository)
|
|
77
77
|
|
|
78
78
|
#TODO do premerge-build instead
|
|
79
|
-
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.createRelease_configuration.repository,self.sc.log.loglevel,"Productive",self.createRelease_configuration.additional_arguments_file,False,False)
|
|
79
|
+
tfcps_CodeUnit_BuildCodeUnits:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(self.createRelease_configuration.repository,self.sc.log.loglevel,"Productive",self.createRelease_configuration.additional_arguments_file,False,False,False)
|
|
80
80
|
try:
|
|
81
81
|
tfcps_CodeUnit_BuildCodeUnits.build_codeunits()
|
|
82
82
|
except Exception:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.102
|
|
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
|
|
@@ -6,7 +6,7 @@ Other/QualityCheck/RunTestcases.py,sha256=3vJBquOr9q1DhF4648FhY_sXS-DV_l193mE_O9
|
|
|
6
6
|
Other/Reference/GenerateReference.py,sha256=MFzu7U1OHxgecYDi7WSulO8XRGBsgkdqV_r_jkyVF7c,369
|
|
7
7
|
ScriptCollection/AnionBuildPlatform.py,sha256=OnL0V0jFGrT3ZbCRamy4LBmeGUu-cBFMbk1bhs_S64k,11781
|
|
8
8
|
ScriptCollection/CertificateUpdater.py,sha256=dR5JpJDlZdjD4_pgMz7zCrt1IM7VfatmK6pULSczxQw,9693
|
|
9
|
-
ScriptCollection/Executables.py,sha256=
|
|
9
|
+
ScriptCollection/Executables.py,sha256=yWKA8yn7G3ZaNgnUjSGVTF_yAQl-NBVBxEMipWfq3YY,46799
|
|
10
10
|
ScriptCollection/GeneralUtilities.py,sha256=4BmzJhTPAZmKQd5YlMuX0E5Dl6fhuVkmVaCpST0WzRk,67654
|
|
11
11
|
ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
|
|
12
12
|
ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
|
|
@@ -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=Pj6fVUZZLSJg3yFzQ5loZ-AONVMPthDyb6K8o2FrvNg,188793
|
|
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
|
|
@@ -32,15 +32,15 @@ ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcB
|
|
|
32
32
|
ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
|
|
33
33
|
ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=EMNDgkUem87aH1csz7eoSBBEKkiZMLZqZhnxKSPQWe0,27845
|
|
34
34
|
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=SWuYcQ6-dx4HxQ_YaD4MB6VS_5Wv6RVWtfWHcxP3KZw,8461
|
|
35
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=
|
|
35
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=voxWT2qr3zx7YI0TudtqQUJ1mai9bqnb6MhL9DTtnNs,16393
|
|
36
36
|
ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=yqGstRjRfVVGbqrcBgtYStqth2x2SvBb3y2Ht8GsuMQ,6554
|
|
37
37
|
ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=Tpzgiz6m3-cYCkObZOG5Uu7oM-EMoWFzzRpLl3Lblqo,2023
|
|
38
|
-
ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256
|
|
39
|
-
ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=
|
|
38
|
+
ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=Vwj7IWmvwIICXiv7I-c6MkxbqlRWCEwzaKW6dgEUjCM,7480
|
|
39
|
+
ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=xVPer8EGH5vhTT3_mpTMJJxWLB3aLxIcyTxKHODMbYg,22201
|
|
40
40
|
ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=f0Uq1cA_4LvmL72cal0crrbKF6PcxL13D9wBKuQ1YBw,2328
|
|
41
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=zR4F8FKzA2CZRcSfXy3DSWlJRRZQcMcFezaTy96TgxE,12168
|
|
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
|
|
@@ -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.102.dist-info/METADATA,sha256=116Cx6_J8GVQqR2INdDeq8h1ufqwnxYnN2G5A52TLas,7697
|
|
295
|
+
scriptcollection-4.2.102.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
296
|
+
scriptcollection-4.2.102.dist-info/entry_points.txt,sha256=wzcO3R2IXAbYjDCev4cF8q1Yn-2ZCNJhiud_NzzJ9RM,4901
|
|
297
|
+
scriptcollection-4.2.102.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
298
|
+
scriptcollection-4.2.102.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|