ScriptCollection 4.3.27__py3-none-any.whl → 4.3.29__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 +2 -2
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py +6 -3
- {scriptcollection-4.3.27.dist-info → scriptcollection-4.3.29.dist-info}/METADATA +1 -1
- {scriptcollection-4.3.27.dist-info → scriptcollection-4.3.29.dist-info}/RECORD +7 -7
- {scriptcollection-4.3.27.dist-info → scriptcollection-4.3.29.dist-info}/WHEEL +0 -0
- {scriptcollection-4.3.27.dist-info → scriptcollection-4.3.29.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.3.27.dist-info → scriptcollection-4.3.29.dist-info}/top_level.txt +0 -0
|
@@ -38,7 +38,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
|
38
38
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
|
39
39
|
from .SCLog import SCLog, LogLevel
|
|
40
40
|
|
|
41
|
-
version = "4.3.
|
|
41
|
+
version = "4.3.29"
|
|
42
42
|
__version__ = version
|
|
43
43
|
|
|
44
44
|
class VSCodeWorkspaceShellTask:
|
|
@@ -2309,7 +2309,7 @@ class ScriptCollectionCore:
|
|
|
2309
2309
|
if not self.path_is_allowed_within_base_folder(actual_folder, base_folder, excluded_folders):
|
|
2310
2310
|
raise ValueError(f"The folder '{resolved_actual_folder}' is not allowed: it must be equal to or a subfolder of the base-folder '{resolved_base_folder}' and must not be located inside one of the excluded folders.")
|
|
2311
2311
|
effective_arguments = arguments.replace(ScriptCollectionCore.run_command_in_folder_actual_folder_placeholder, resolved_actual_folder)
|
|
2312
|
-
result = self.run_program(command, effective_arguments, resolved_base_folder)
|
|
2312
|
+
result = self.run_program(command, effective_arguments, resolved_base_folder,print_live_output=True)
|
|
2313
2313
|
return result[0]
|
|
2314
2314
|
|
|
2315
2315
|
# Return-values program_runner: Exitcode, StdOut, StdErr, Pid
|
|
@@ -114,15 +114,18 @@ class TFCPS_CodeUnit_BuildCodeUnits:
|
|
|
114
114
|
self.__translate()
|
|
115
115
|
self.__collect_metrics()
|
|
116
116
|
self.__generate_loc_diagram()
|
|
117
|
+
|
|
118
|
+
if self.__assert_no_new_changes:
|
|
119
|
+
self.sc.assert_no_uncommitted_changes(self.repository,"There are new uncommitted changes in the repository.")
|
|
120
|
+
|
|
121
|
+
#the ready-to-merge-flag-file itself must not be part of the uncommitted-changes-check above, otherwise setting/clearing it would always trigger that assertion.
|
|
122
|
+
if self.is_pre_merge():
|
|
117
123
|
GeneralUtilities.ensure_file_does_not_exist(ready_to_merge_file)
|
|
118
124
|
else:
|
|
119
125
|
if self.is_working_branch():
|
|
120
126
|
if self.add_ready_to_merge_flag():
|
|
121
127
|
GeneralUtilities.ensure_file_exists(ready_to_merge_file)
|
|
122
128
|
|
|
123
|
-
if self.__assert_no_new_changes:
|
|
124
|
-
self.sc.assert_no_uncommitted_changes(self.repository,"There are new uncommitted changes in the repository.")
|
|
125
|
-
|
|
126
129
|
end_time:datetime=GeneralUtilities.get_now()
|
|
127
130
|
duration=end_time-start_time
|
|
128
131
|
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)})")
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.3.
|
|
3
|
+
Version: 4.3.29
|
|
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=LdzSJy3NnnwYCCefz2h4tiTy4BjT8lOz3IBG_bMOg9E,4821
|
|
12
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
12
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=bIo05MeI-kvfmUYVKWIeNWmfTsXoA6Xz22AGClHFX0g,246436
|
|
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
|
|
@@ -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=H9FWlS6BPK-UWJXdWN686ePky4Hq-Q13T0Kx8HSJu7s,34990
|
|
37
37
|
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=Ll5EOkpVpPiFrM2mLeQXolaF7075IwgtnHXvfdpkH4k,9904
|
|
38
|
-
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=
|
|
38
|
+
ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=lAD_WjR-pTd_zup8dmTRoH3qvv11r0zrDwrdQ6WX6to,31282
|
|
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=zp7n0Li7GTi4tERDMgDcJ-o3m6131m31zvkat0lALEc,7781
|
|
@@ -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.
|
|
67
|
-
scriptcollection-4.3.
|
|
68
|
-
scriptcollection-4.3.
|
|
69
|
-
scriptcollection-4.3.
|
|
70
|
-
scriptcollection-4.3.
|
|
66
|
+
scriptcollection-4.3.29.dist-info/METADATA,sha256=ky9CAWLf3oHngkpc1_TsKqGR5k5Olvsa_XErBkfKkeE,7816
|
|
67
|
+
scriptcollection-4.3.29.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
|
|
68
|
+
scriptcollection-4.3.29.dist-info/entry_points.txt,sha256=Iq9YMSTWNCAJpBzM5L9CQx80tL9-XUu6MzDRAdBrIPg,5875
|
|
69
|
+
scriptcollection-4.3.29.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
70
|
+
scriptcollection-4.3.29.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|