ScriptCollection 4.3.7__py3-none-any.whl → 4.3.8__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.
@@ -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.3.7"
40
+ version = "4.3.8"
41
41
  __version__ = version
42
42
 
43
43
  class VSCodeWorkspaceShellTask:
@@ -39,6 +39,12 @@ class TFCPS_CodeUnit_BuildCodeUnits:
39
39
  def build_codeunits(self) -> None:
40
40
  self.sc.log.log(GeneralUtilities.get_line())
41
41
  start_time:datetime=GeneralUtilities.get_now()
42
+
43
+ if self.is_pre_merge():
44
+ GeneralUtilities.assert_condition(not self.__assert_no_new_changes,f"A pre-merge build can not be done with the assert-no-new-changes-option.")
45
+ ready_to_merge_file=os.path.join(self.repository,".ScriptCollection",".IsReadyToMerge")
46
+ GeneralUtilities.ensure_file_does_not_exist(ready_to_merge_file)
47
+
42
48
  self.sc.log.log(f"Start building codeunits at {GeneralUtilities.datetime_to_string_for_readable_entry(start_time,False)}. (Target environment-type: {self.target_environment_type})")
43
49
  if self.__assert_no_new_changes:
44
50
  self.sc.assert_no_uncommitted_changes(self.repository,"Can not build codeunit: There are uncommitted changes in the repository.")
@@ -78,13 +84,19 @@ class TFCPS_CodeUnit_BuildCodeUnits:
78
84
  tFCPS_CodeUnit_BuildCodeUnit.build_codeunit()
79
85
 
80
86
  self.sc.log.log(GeneralUtilities.get_line())
87
+
81
88
  self.search_for_secrets()
82
89
  self.__search_for_vulnerabilities()
83
90
  self.__normalize_md_and_txt_line_endings()
91
+
84
92
  if self.is_pre_merge():
85
93
  self.__translate()
86
94
  self.__collect_metrics()
87
95
  self.__generate_loc_diagram()
96
+ GeneralUtilities.ensure_file_does_not_exist(ready_to_merge_file)
97
+ else:
98
+ if self.is_working_branch():
99
+ GeneralUtilities.ensure_file_exists(ready_to_merge_file)
88
100
 
89
101
  if self.__assert_no_new_changes:
90
102
  self.sc.assert_no_uncommitted_changes(self.repository,"There are new uncommitted changes in the repository.")
@@ -101,6 +113,14 @@ class TFCPS_CodeUnit_BuildCodeUnits:
101
113
  for text_file in self.sc.get_not_git_ignored_files_of_folder(self.repository, text_file_extension):
102
114
  self.sc.normalize_line_endings(text_file)
103
115
 
116
+ @GeneralUtilities.check_arguments
117
+ def is_working_branch(self)->bool:
118
+ if self.sc.git_repository_has_uncommitted_changes(self.repository):
119
+ return True
120
+ if self.sc.git_get_current_branch_name(self.repository) != "main":
121
+ return True
122
+ return False
123
+
104
124
  @GeneralUtilities.check_arguments
105
125
  def run_prepare_script(self):
106
126
  args=["--repository",self.repository,"--targetenvironmenttype",self.target_environment_type,"--verbosity",str(int(self.sc.log.loglevel))]
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: scriptcollection
3
- Version: 4.3.7
3
+ Version: 4.3.8
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=Z-HhC_CRtU3HdQflNsabFh9IJOucHcXmxMDcf58fli0,4671
12
- ScriptCollection/ScriptCollectionCore.py,sha256=x6ZdUAJ7Ul1lAGEHxVQlaVxlTP4GaJ6rzX4VNm5Aj2Q,228365
12
+ ScriptCollection/ScriptCollectionCore.py,sha256=-m0zO_8CrKrNNkQyPruNgWLBEGy9DtbDQGsKuc0_kNs,228365
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=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
@@ -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=oICRtl85n2puWvchcJIkmLZL1BAylMbzH7ltBGWfqgY,31973
37
37
  ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=s4E20EkvFZpsg2c2Gu-D6kHXS0QIkpx_chawHNSnlnU,9891
38
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=T5xW98EslPov-DBwd3R0tO8PhrA-ZsQUaHh2vVOJSlg,24197
38
+ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=Y3-RQMq_unc07K0Srio7mmVFYOWTST_uXC5s5nk1wPM,25081
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=BsSV4a-NZY86MZ20d-_rYxNVAI4UzAfmEwXlRZ8qWQc,7685
@@ -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.7.dist-info/METADATA,sha256=9seZtqxlfqMGKrC5oYPes6A6N-NiMNeibmjEEVrZbSU,7815
67
- scriptcollection-4.3.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
68
- scriptcollection-4.3.7.dist-info/entry_points.txt,sha256=MwiP9P29EeSfjS19JOZmqbx8OzpZrUWpgMza3EffBs8,5812
69
- scriptcollection-4.3.7.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
70
- scriptcollection-4.3.7.dist-info/RECORD,,
66
+ scriptcollection-4.3.8.dist-info/METADATA,sha256=xqPiQfLriU_ip9MtuU_WQW06FpCG5k2UsL_QyZvM0Y0,7815
67
+ scriptcollection-4.3.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
68
+ scriptcollection-4.3.8.dist-info/entry_points.txt,sha256=MwiP9P29EeSfjS19JOZmqbx8OzpZrUWpgMza3EffBs8,5812
69
+ scriptcollection-4.3.8.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
70
+ scriptcollection-4.3.8.dist-info/RECORD,,