ScriptCollection 4.2.70__py3-none-any.whl → 4.2.71__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.
Files changed (7) hide show
  1. ScriptCollection/ScriptCollectionCore.py +1 -1
  2. ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +12 -16
  3. {scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/METADATA +1 -1
  4. {scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/RECORD +7 -7
  5. {scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/WHEEL +0 -0
  6. {scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/entry_points.txt +0 -0
  7. {scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/top_level.txt +0 -0
ScriptCollection/ScriptCollectionCore.py CHANGED
@@ -37,7 +37,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
37
37
  from .ProgramRunnerPopen import ProgramRunnerPopen
38
38
  from .SCLog import SCLog, LogLevel
39
39
 
40
- version = "4.2.70"
40
+ version = "4.2.71"
41
41
  __version__ = version
42
42
 
43
43
  class VSCodeWorkspaceShellTask:
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py CHANGED
@@ -76,26 +76,22 @@ class TFCPS_CodeUnit_BuildCodeUnits:
76
76
 
77
77
  @GeneralUtilities.check_arguments
78
78
  def run_prepare_script(self):
79
- pre_script_file:str=os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScript.py")
80
- if os.path.isfile( pre_script_file):
79
+ args=["--repository",self.repository,"--targetenvironmenttype",self.target_environment_type,"--verbosity",str(int(self.sc.log.loglevel))]
80
+ if GeneralUtilities.string_has_content(self.additionalargumentsfile):
81
+ args=args+["--additionalargumentsfile", self.additionalargumentsfile]
82
+ if not self.__use_cache:
83
+ if self.sc.git_repository_has_uncommitted_changes(self.repository):
84
+ self.sc.log.log("No-cache-option can not be applied because there are uncommited changes in the repository.",LogLevel.Warning)
85
+ else:
86
+ args=args+["--nocache"]
87
+
88
+ if os.path.isfile( os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS","CustomPreCodeUnitBuildScript.py")):
81
89
  self.sc.log.log("Run custom pre-codeunitbuild script...")
82
- argument= f"CustomPreCodeUnitBuildScript.py --repository {self.repository} --targetenvironmenttype {self.target_environment_type} --verbosity {int(self.sc.log.loglevel)}"
83
- if GeneralUtilities.string_has_content(self.additionalargumentsfile):
84
- argument=f"{argument} --additionalargumentsfile {self.additionalargumentsfile}"
85
- if not self.__use_cache:
86
- argument=f"{argument} --nocache"
87
- self.sc.run_program("python",argument, os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)
90
+ self.sc.run_program_argsasarray("python",["CustomPreCodeUnitBuildScript.py"]+args, os.path.join( self.sc.get_scriptcollection_configuration_folder(),"TFCPS"),print_live_output=True)
88
91
 
89
92
  if os.path.isfile( os.path.join(self.repository,"Other","Scripts","PrepareBuildCodeunits.py")):
90
- arguments:str=f"--targetenvironmenttype {self.target_environment_type} --additionalargumentsfile \"{self.additionalargumentsfile}\" --verbosity {int(self.sc.log.loglevel)}"
91
- if not self.__use_cache:
92
- arguments=f"{arguments} --nocache"
93
- if self.sc.git_repository_has_uncommitted_changes(self.repository):
94
- self.sc.log.log("No-cache-option can not be applied because there are uncommited changes in the repository.",LogLevel.Warning)
95
- else:
96
- self.sc.run_program("git","clean -dfx",self.repository)
97
93
  self.sc.log.log("Prepare build codeunits...")
98
- self.sc.run_program("python", f"PrepareBuildCodeunits.py {arguments}", os.path.join(self.repository,"Other","Scripts"),print_live_output=True)
94
+ self.sc.run_program_argsasarray("python",["PrepareBuildCodeunits.py"]+args, os.path.join(self.repository,"Other","Scripts"),print_live_output=True)
99
95
 
100
96
  @GeneralUtilities.check_arguments
101
97
  def build_codeunits_in_container(self) -> None:
{scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ScriptCollection
3
- Version: 4.2.70
3
+ Version: 4.2.71
4
4
  Summary: The ScriptCollection is the place for reusable scripts.
5
5
  Home-page: https://github.com/anionDev/ScriptCollection
6
6
  Author: Marius Göcke
{scriptcollection-4.2.70.dist-info → scriptcollection-4.2.71.dist-info}/RECORD RENAMED
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
9
9
  ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
10
10
  ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
11
11
  ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
12
- ScriptCollection/ScriptCollectionCore.py,sha256=lVRgY6YA3UPwYXuuFZ9IjlwW-C-_s-ENT3K7s2_5FwU,180421
12
+ ScriptCollection/ScriptCollectionCore.py,sha256=CHXFzsT2f1gfgLe_TDiIICDKQi-AUD5LUjVH9Lc6A5k,180421
13
13
  ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
14
14
  ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=83qDMILwxhH9DbC0sb358Vu8PXEysmJJyap_6gECZqs,1627
15
15
  ScriptCollection/OCIImages/OCIImageManager.py,sha256=aBogkSXNDyi8NO11N-s03nuFJEv7PyJ-wjHuYYeZfvs,6662
@@ -24,7 +24,7 @@ ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcB
24
24
  ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
25
25
  ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=EMNDgkUem87aH1csz7eoSBBEKkiZMLZqZhnxKSPQWe0,27845
26
26
  ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=MieeAAKm1y58qXp1cCUN5mj5vwpq4Pc1uusUjPQzpvc,8237
27
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=8vVSVXlLxu8xct-5vISOJ7dJlsNnnAcwBzCb59PEY6k,15520
27
+ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=3Mo8XrTDD1Z7_K1PLxSPYA-fePQ95sIAeNKGj0matiw,15109
28
28
  ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=yqGstRjRfVVGbqrcBgtYStqth2x2SvBb3y2Ht8GsuMQ,6554
29
29
  ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=O-0guM_LJCcZmPZJhMgTvXD2RXUJEBWWv6Bt6hDFhvM,1943
30
30
  ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=-Ev9D3bZDlUk2WFQhcmvzQ3FCS97OdsVUd0koAdmpZc,7474
@@ -47,8 +47,8 @@ ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=GQLE6FeR-X
47
47
  ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
48
48
  ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=9XK7XnbeOnq_4siVoWovogStoKFiZLhGh3C_f2YaznI,13621
49
49
  ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
50
- scriptcollection-4.2.70.dist-info/METADATA,sha256=ZH8RQwQoInXomGWNzDd0_tMMN1WkGMhU1FfXG2YZ174,7690
51
- scriptcollection-4.2.70.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
52
- scriptcollection-4.2.70.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
53
- scriptcollection-4.2.70.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
54
- scriptcollection-4.2.70.dist-info/RECORD,,
50
+ scriptcollection-4.2.71.dist-info/METADATA,sha256=AqeIZ0bihEiuUCtCAc4go-OsxfnC8OXweAbFR1sbpQc,7690
51
+ scriptcollection-4.2.71.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
52
+ scriptcollection-4.2.71.dist-info/entry_points.txt,sha256=27XwAJEcaMEc1be0Ec1vKHCbiU4Ziu8jKL-SqsrYOIQ,4680
53
+ scriptcollection-4.2.71.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
54
+ scriptcollection-4.2.71.dist-info/RECORD,,