ScriptCollection 4.3.22__py3-none-any.whl → 4.3.23__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 +5 -5
- {scriptcollection-4.3.22.dist-info → scriptcollection-4.3.23.dist-info}/METADATA +1 -1
- {scriptcollection-4.3.22.dist-info → scriptcollection-4.3.23.dist-info}/RECORD +6 -6
- {scriptcollection-4.3.22.dist-info → scriptcollection-4.3.23.dist-info}/WHEEL +0 -0
- {scriptcollection-4.3.22.dist-info → scriptcollection-4.3.23.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.3.22.dist-info → scriptcollection-4.3.23.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.23"
|
|
42
42
|
__version__ = version
|
|
43
43
|
|
|
44
44
|
class VSCodeWorkspaceShellTask:
|
|
@@ -2430,7 +2430,7 @@ class ScriptCollectionCore:
|
|
|
2430
2430
|
"""
|
|
2431
2431
|
commit_id = self.git_get_commit_id(repository_folder)
|
|
2432
2432
|
cache_key = (repository_folder, commit_id, branch_name)
|
|
2433
|
-
if cache_key in self.__next_gitversion_cache
|
|
2433
|
+
if cache_key in self.__next_gitversion_cache:#TODO remove __next_gitversion_cache (disk-cache is enough, transient cache here is unnecessary)
|
|
2434
2434
|
return self.__next_gitversion_cache[cache_key]
|
|
2435
2435
|
persisted_result = self.__read_next_version_from_disk_cache(repository_folder, commit_id, branch_name)
|
|
2436
2436
|
if persisted_result is not None:
|
|
@@ -2441,7 +2441,7 @@ class ScriptCollectionCore:
|
|
|
2441
2441
|
self.git_clone(temp_folder, repository_folder, include_submodules=False)
|
|
2442
2442
|
# the local clone already checks out the source's current branch on the tagged commit; the explicit checkout only guarantees gitversion sees the correct branch-name (and thus the correct increment-rule)
|
|
2443
2443
|
self.run_program_argsasarray("git", ["checkout", branch_name], temp_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
2444
|
-
self.
|
|
2444
|
+
self.run_program("git","-c user.name=\"noname\" -c user.email=\"noname@example.com\" commit -m empty --quiet --allow-empty", temp_folder, no_changes_behavior=1)
|
|
2445
2445
|
result = self.get_version_from_gitversion(temp_folder, "MajorMinorPatch")
|
|
2446
2446
|
self.__next_gitversion_cache[cache_key] = result
|
|
2447
2447
|
self.__write_next_version_to_disk_cache(repository_folder, commit_id, branch_name, result)
|
|
@@ -2470,8 +2470,8 @@ class ScriptCollectionCore:
|
|
|
2470
2470
|
def __read_next_version_from_disk_cache(self, repository_folder: str, commit_id: str, branch_name: str) -> str:
|
|
2471
2471
|
# returns None if there is no cached entry for the given commit and branch. the entries use a tab as separator because git-ref-names can not contain tabs (or any other control-character), so the branch-name can never collide with the separator.
|
|
2472
2472
|
cache_file = self.__get_next_version_disk_cache_file(repository_folder)
|
|
2473
|
-
|
|
2474
|
-
|
|
2473
|
+
GeneralUtilities.ensure_directory_exists(os.path.dirname(cache_file))
|
|
2474
|
+
GeneralUtilities.ensure_file_exists(cache_file)
|
|
2475
2475
|
for line in GeneralUtilities.read_nonempty_lines_from_file(cache_file):
|
|
2476
2476
|
parts = line.split("\t")
|
|
2477
2477
|
if len(parts) == 3 and parts[0] == commit_id and parts[1] == branch_name:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.3.
|
|
3
|
+
Version: 4.3.23
|
|
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=r8OZFw3AFvH2IwIS_OY8bps3AKOyXSNj-7UZFYJMjaY,240339
|
|
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
|
|
@@ -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.23.dist-info/METADATA,sha256=mQtFTL13JeD0ATzyX3UvVWJPaBJOK5Z9UU1cNFHMNmM,7816
|
|
67
|
+
scriptcollection-4.3.23.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
|
|
68
|
+
scriptcollection-4.3.23.dist-info/entry_points.txt,sha256=Iq9YMSTWNCAJpBzM5L9CQx80tL9-XUu6MzDRAdBrIPg,5875
|
|
69
|
+
scriptcollection-4.3.23.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
70
|
+
scriptcollection-4.3.23.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|