ScriptCollection 4.3.2__py3-none-any.whl → 4.3.3__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/AnionBuildPlatform.py +1 -1
- ScriptCollection/ScriptCollectionCore.py +3 -2
- {scriptcollection-4.3.2.dist-info → scriptcollection-4.3.3.dist-info}/METADATA +1 -1
- {scriptcollection-4.3.2.dist-info → scriptcollection-4.3.3.dist-info}/RECORD +7 -7
- {scriptcollection-4.3.2.dist-info → scriptcollection-4.3.3.dist-info}/WHEEL +0 -0
- {scriptcollection-4.3.2.dist-info → scriptcollection-4.3.3.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.3.2.dist-info → scriptcollection-4.3.3.dist-info}/top_level.txt +0 -0
|
@@ -65,7 +65,7 @@ class AnionBuildPlatform:
|
|
|
65
65
|
self.__sc.git_commit(build_repo_folder,"Updated changes")
|
|
66
66
|
self.__sc.git_fetch(build_repo_folder)
|
|
67
67
|
for remote in self.__sc.git_get_all_remote_names(build_repo_folder):
|
|
68
|
-
self.__sc.git_merge(build_repo_folder,remote+"/"
|
|
68
|
+
self.__sc.git_merge(build_repo_folder,remote+"/main","main")
|
|
69
69
|
|
|
70
70
|
# Pull changes from remote
|
|
71
71
|
self.__sc.git_fetch(repository)
|
|
@@ -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.
|
|
40
|
+
version = "4.3.3"
|
|
41
41
|
__version__ = version
|
|
42
42
|
|
|
43
43
|
class VSCodeWorkspaceShellTask:
|
|
@@ -497,7 +497,8 @@ class ScriptCollectionCore:
|
|
|
497
497
|
@GeneralUtilities.check_arguments
|
|
498
498
|
def git_get_commit_id(self, repository_folder: str, rev: str = "HEAD") -> str:
|
|
499
499
|
self.is_git_or_bare_git_repository(repository_folder)
|
|
500
|
-
|
|
500
|
+
# Append "^{commit}" so that annotated tags are dereferenced to the commit they point to instead of returning the SHA of the tag-object itself.
|
|
501
|
+
result: tuple[int, str, str, int] = self.run_program_argsasarray("git", ["rev-parse", "--verify", f"{rev}^{{commit}}"], repository_folder, throw_exception_if_exitcode_is_not_zero=True)
|
|
501
502
|
return result[1].replace('\n', '')
|
|
502
503
|
|
|
503
504
|
@GeneralUtilities.check_arguments
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.3.
|
|
3
|
+
Version: 4.3.3
|
|
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,4 +1,4 @@
|
|
|
1
|
-
ScriptCollection/AnionBuildPlatform.py,sha256=
|
|
1
|
+
ScriptCollection/AnionBuildPlatform.py,sha256=T1tkh4pzQyUb8r5acWiv95TvmkNnDhiNaQAP2dJJvoA,12057
|
|
2
2
|
ScriptCollection/CertificateUpdater.py,sha256=dR5JpJDlZdjD4_pgMz7zCrt1IM7VfatmK6pULSczxQw,9693
|
|
3
3
|
ScriptCollection/Executables.py,sha256=Ha0DRqeqxhOM9V-MPd1rozSEWVSRHji6XwysWf7JS8k,66378
|
|
4
4
|
ScriptCollection/GeneralUtilities.py,sha256=9-hL-qbbCW42XOz6kMtZyTQA4MsLeCbvqXtuB-Ab_r4,69161
|
|
@@ -9,7 +9,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
9
9
|
ScriptCollection/ProgramRunnerPopen.py,sha256=8tP0xWKeRYoGlaNB3iUh4o61O-tKtcxrS7IUqtU85C4,4091
|
|
10
10
|
ScriptCollection/ProgramRunnerSudo.py,sha256=RXsiceQ8W6a8YDk_2BPscVbIAmDIpIxqe9WHBy2r4CM,5233
|
|
11
11
|
ScriptCollection/SCLog.py,sha256=Z-HhC_CRtU3HdQflNsabFh9IJOucHcXmxMDcf58fli0,4671
|
|
12
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
12
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=x7LGpiV-ViWK-u_6xhcOaZEVnmpS4os7JLkOo-kOnwA,223745
|
|
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
|
|
@@ -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.3.dist-info/METADATA,sha256=RPdoXaSXRqhykTokvk4i0ZJuNUdqOzb1MAlxBHnDimQ,7815
|
|
67
|
+
scriptcollection-4.3.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
68
|
+
scriptcollection-4.3.3.dist-info/entry_points.txt,sha256=MwiP9P29EeSfjS19JOZmqbx8OzpZrUWpgMza3EffBs8,5812
|
|
69
|
+
scriptcollection-4.3.3.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
70
|
+
scriptcollection-4.3.3.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|