ScriptCollection 4.3.55__py3-none-any.whl → 4.3.57__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.
@@ -258,16 +258,22 @@ def BuildCodeUnits() -> int:
258
258
  parser.add_argument('-u','--assertnonewchanges', required=False, default=False, action='store_true')
259
259
  parser.add_argument('-m','--addreadytomergeflag', required=False, default=False, action='store_true')
260
260
  parser.add_argument('-c','--runincontainer', required=False, default=False, action='store_true')
261
+ parser.add_argument('-b','--basemountfolder', required=False, default=None, help="Only used if -c is set.")
261
262
  args = parser.parse_args()
262
263
 
263
264
  verbosity=LogLevel(int(args.verbosity))
264
265
  repo:str=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
266
+
265
267
  t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,args.ispremerge,args.assertnonewchanges,args.addreadytomergeflag)
266
268
  if args.runincontainer:
267
- t.build_codeunits_in_container(repo)
269
+ base_mount_folder:str=args.basemountfolder
270
+ if base_mount_folder is None:
271
+ base_mount_folder=repo
272
+ success, _ = t.build_codeunits_in_container(base_mount_folder)
273
+ return 0 if success else 1
268
274
  else:
269
275
  t.build_codeunits()
270
- return 0
276
+ return 0
271
277
 
272
278
  def BuildCodeUnitsC() -> int:
273
279
  parser = argparse.ArgumentParser()
@@ -1386,6 +1386,7 @@ class GeneralUtilities:
1386
1386
  @check_arguments
1387
1387
  def normalize_path(path)->str:
1388
1388
  path=str(path)
1389
+ path=os.path.expandvars(path)
1389
1390
  if GeneralUtilities.current_system_is_windows():
1390
1391
  path=path.replace("/","\\")
1391
1392
  else:
@@ -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.3.55"
42
+ version = "4.3.57"
43
43
  __version__ = version
44
44
 
45
45
  class VSCodeWorkspaceShellTask:
@@ -2545,7 +2545,11 @@ class ScriptCollectionCore:
2545
2545
  scriptcollection_folder = os.path.join(repository_folder, ".ScriptCollection")
2546
2546
  GeneralUtilities.ensure_directory_exists(scriptcollection_folder)
2547
2547
  gitignore_file = os.path.join(scriptcollection_folder, ".gitignore")
2548
- lines = ["/Cache/"]
2548
+ lines = [
2549
+ "/Cache/",
2550
+ "RequiredEnvVariables.local.csv",
2551
+ "CustomPreCodeUnitBuildScriptInContainer.local.py",
2552
+ ]
2549
2553
  GeneralUtilities.write_lines_to_file(gitignore_file, lines)
2550
2554
 
2551
2555
  @GeneralUtilities.check_arguments
@@ -202,6 +202,16 @@ class TFCPS_CodeUnit_BuildCodeUnits:
202
202
  else:
203
203
  args=args+["--nocache"]
204
204
 
205
+ if self.sc.is_running_in_build_container():
206
+
207
+ if os.path.isfile( os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScriptInContainer.py")):
208
+ self.sc.log.log("Run custom pre-codeunitbuild script...")
209
+ self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["CustomPreCodeUnitBuildScriptInContainer.py"]+args, os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)
210
+
211
+ if os.path.isfile( os.path.join(self.repository,".ScriptCollection","CustomPreCodeUnitBuildScriptInContainer.local.py")):
212
+ self.sc.log.log("Prepare build codeunits...")
213
+ self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["CustomPreCodeUnitBuildScriptInContainer.local.py"]+args, os.path.join(self.repository,".ScriptCollection"),print_live_output=True)
214
+
205
215
  if os.path.isfile( os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScript.py")):
206
216
  self.sc.log.log("Run custom pre-codeunitbuild script...")
207
217
  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)
@@ -246,20 +256,25 @@ class TFCPS_CodeUnit_BuildCodeUnits:
246
256
  scbuildcodeunits_arguments=["bash","-c", "pip3 install scriptcollection --upgrade && scshowversion && "+" ".join(scbuildcodeunits_arguments)]
247
257
 
248
258
  args=["--repository",self.repository,"--targetenvironmenttype",self.target_environment_type,"--verbosity",str(int(self.sc.log.loglevel))]
249
-
259
+
250
260
  if os.path.isfile( os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScriptForContainer.py")):
251
261
  self.sc.log.log("Run custom pre-codeunitbuild script for container...")
252
262
  self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["CustomPreCodeUnitBuildScriptForContainer.py"]+args, os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)
253
-
263
+
254
264
  if os.path.isfile( os.path.join(self.repository,"Other","Scripts","CustomPreCodeUnitBuildScriptForContainer.py")):
255
265
  self.sc.log.log("Prepare build codeunits for container...")
256
266
  self.sc.run_program_argsasarray(GeneralUtilities.get_python_executable(),["CustomPreCodeUnitBuildScriptForContainer.py"]+args, os.path.join(self.repository,"Other","Scripts"),print_live_output=True)
257
267
 
268
+ if os.path.isfile( os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScriptInContainer.py")):
269
+ args += ["-v", os.path.join( GeneralUtilities.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScriptInContainer.py")+f":~/.ScriptCollection/TFCPS/CustomPreCodeUnitBuildScriptInContainer.py" ]
270
+
258
271
  #pass the env-variables defined in <repository>/.ScriptCollection/RequiredEnvVariables.csv (if any) into the container so they do not have to be specified explicitly on every scbuildcodeunitsc-call.
259
272
  env_arguments: list[str] = []
260
273
  for env_variable_name, env_variable_value in self.tfcps_tools_general.get_required_env_variables(self.repository).items():
261
274
  env_arguments += ["-e", f"{env_variable_name}={env_variable_value}"]
262
275
 
276
+
277
+
263
278
  #run scbuildcodeunits inside the SCBuilder-image. base_mount_folder is mounted into the container (covering the repository and, for submodules, its real gitdir) and the docker-socket is forwarded because codeunit-builds often start containers (for example local test-services).
264
279
  docker_arguments = [
265
280
  "run", "--rm",
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: scriptcollection
3
- Version: 4.3.55
3
+ Version: 4.3.57
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
@@ -1,7 +1,7 @@
1
1
  ScriptCollection/AnionBuildPlatform.py,sha256=GP-jnb1GbvT8jzlH-cqnxgOzBzeUdiaWnDXtKNjsxiA,12153
2
2
  ScriptCollection/CertificateUpdater.py,sha256=dR5JpJDlZdjD4_pgMz7zCrt1IM7VfatmK6pULSczxQw,9693
3
- ScriptCollection/Executables.py,sha256=x91j_zkKezLekL7i7eiR_KNbV4N5HdltlhanwNXP5AI,67593
4
- ScriptCollection/GeneralUtilities.py,sha256=SBP37EyUcU0_x0-XV5zlwi557AlZssU1QXrKIhkdTIs,72145
3
+ ScriptCollection/Executables.py,sha256=-KraI_mYOyO0mESzSYeS2jNypChYQSftZrONj6K3e9I,67895
4
+ ScriptCollection/GeneralUtilities.py,sha256=SmN5PV0vI5TZZCjVulIrYRzdogxNAeTqQ27ZKb6gul0,72184
5
5
  ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
6
6
  ScriptCollection/ProcessesRunner.py,sha256=yYaC95h40uszuZPggn2kK3qXIN2ZjGMCavo-NQ53ElQ,1537
7
7
  ScriptCollection/ProgramRunnerBase.py,sha256=eZenpiIFW1dhvSVCG7cfBs5hO4_KLlOxR7oXoSxUDmk,2286
@@ -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=4NmeOKZ51SnWxMMWqfhBSedaKjrDQCuOw4vCLiUYzT4,248737
12
+ ScriptCollection/ScriptCollectionCore.py,sha256=gUOFGR8YRHOytDyU42MwFRmu8GpbnJsU07GcdVaCerw,248876
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
@@ -36,7 +36,7 @@ ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz
36
36
  ScriptCollection/TFCPS/SCTaskRunnerServer.py,sha256=rpuwSsQ6YQfZS2LGnvOH5ql8zs_-cHU4LQttS7XNT60,11272
37
37
  ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=H9FWlS6BPK-UWJXdWN686ePky4Hq-Q13T0Kx8HSJu7s,34990
38
38
  ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=Ll5EOkpVpPiFrM2mLeQXolaF7075IwgtnHXvfdpkH4k,9904
39
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=W_-sVAxBrpYZen_1YOGICRHmLvkMyfJ5iqk7FVvieUY,36106
39
+ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=zzJlNLlAYVJS5_UyjZ34W_1GmhvnrlcOLiJRfea1X1o,37491
40
40
  ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=X2NgZgbOkJsdZ6wMHB_RuS_rQCuz5oQCqzYrxyXBN9Q,6680
41
41
  ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=5vCFfDiU8bvfcnoKNs2ATS8nsl6mYXcIuX7XfYE0tvg,2116
42
42
  ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=zp7n0Li7GTi4tERDMgDcJ-o3m6131m31zvkat0lALEc,7781
@@ -64,8 +64,8 @@ ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=Bd1gxCk9Fb
64
64
  ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
65
65
  ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
66
66
  ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
67
- scriptcollection-4.3.55.dist-info/METADATA,sha256=bB4sLm2ipWmSeyUZVk-f8exMUcpSWpD0pU7OtPjiA8M,7648
68
- scriptcollection-4.3.55.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
69
- scriptcollection-4.3.55.dist-info/entry_points.txt,sha256=SCaysPSowWjcCsPpNgVQIKYfo1I5BMiVI39LTWl4qDI,5915
70
- scriptcollection-4.3.55.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
71
- scriptcollection-4.3.55.dist-info/RECORD,,
67
+ scriptcollection-4.3.57.dist-info/METADATA,sha256=euXmU3evPvsNTiECE9IwN_ScibCAAY2-RQa3HMAU9Nk,7648
68
+ scriptcollection-4.3.57.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
69
+ scriptcollection-4.3.57.dist-info/entry_points.txt,sha256=SCaysPSowWjcCsPpNgVQIKYfo1I5BMiVI39LTWl4qDI,5915
70
+ scriptcollection-4.3.57.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
71
+ scriptcollection-4.3.57.dist-info/RECORD,,