ScriptCollection 4.2.110__py3-none-any.whl → 4.2.112__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/Executables.py +1 -1
- ScriptCollection/ScriptCollectionCore.py +1 -1
- ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py +12 -9
- {scriptcollection-4.2.110.dist-info → scriptcollection-4.2.112.dist-info}/METADATA +1 -1
- {scriptcollection-4.2.110.dist-info → scriptcollection-4.2.112.dist-info}/RECORD +8 -8
- {scriptcollection-4.2.110.dist-info → scriptcollection-4.2.112.dist-info}/WHEEL +0 -0
- {scriptcollection-4.2.110.dist-info → scriptcollection-4.2.112.dist-info}/entry_points.txt +0 -0
- {scriptcollection-4.2.110.dist-info → scriptcollection-4.2.112.dist-info}/top_level.txt +0 -0
ScriptCollection/Executables.py
CHANGED
|
@@ -302,7 +302,7 @@ def UpdateDependencies() -> int:
|
|
|
302
302
|
args = parser.parse_args()
|
|
303
303
|
verbosity=LogLevel(int(args.verbosity))
|
|
304
304
|
repo:str=GeneralUtilities.resolve_relative_path(args.repositoryfolder,os.getcwd())
|
|
305
|
-
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,False,False
|
|
305
|
+
t:TFCPS_CodeUnit_BuildCodeUnits=TFCPS_CodeUnit_BuildCodeUnits(repo,verbosity,args.targetenvironment,args.additionalargumentsfile,not args.nocache,False,False)
|
|
306
306
|
t.update_dependencies()
|
|
307
307
|
return 0
|
|
308
308
|
|
|
@@ -116,7 +116,14 @@ class TFCPS_CodeUnitSpecific_Python_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
116
116
|
is_in_dependency_section=True
|
|
117
117
|
elif line.startswith(" "):
|
|
118
118
|
if is_in_dependency_section:
|
|
119
|
-
|
|
119
|
+
stripped = line.strip()
|
|
120
|
+
if not stripped or stripped.startswith("#"):
|
|
121
|
+
continue
|
|
122
|
+
if stripped.endswith(","):
|
|
123
|
+
stripped = stripped[:-1].rstrip()
|
|
124
|
+
if len(stripped) >= 2 and stripped[0] in ('"', "'") and stripped[-1] == stripped[0]:
|
|
125
|
+
stripped = stripped[1:-1]
|
|
126
|
+
match = re.match(r"^([A-Za-z0-9_\-\.]+)\s*([<>=!~]+)?\s*(.*)?$", stripped)
|
|
120
127
|
if match:
|
|
121
128
|
dep_name = match.group(1)
|
|
122
129
|
dep_operator = match.group(2) or None#pylint:disable=unused-variable
|
|
@@ -183,16 +190,12 @@ class TFCPS_CodeUnitSpecific_Python_Functions(TFCPS_CodeUnitSpecific_Base):
|
|
|
183
190
|
lines=GeneralUtilities.read_lines_from_file(setupcfg_file)
|
|
184
191
|
new_lines:list[str]=[]
|
|
185
192
|
for line in lines:
|
|
186
|
-
match = re.match(
|
|
193
|
+
match = re.match(r'^(\s*)"(' + re.escape(name) + r')\s*([<>=!~]+)?\s*([^"]*?)"(,?)\s*$', line)
|
|
187
194
|
if match:
|
|
188
195
|
whitespace = match.group(1)
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
new_line=whitespace+name
|
|
193
|
-
if dep_operator is None:
|
|
194
|
-
dep_operator=">="
|
|
195
|
-
new_line=new_line+dep_operator+new_version
|
|
196
|
+
dep_operator = match.group(3) or ">="
|
|
197
|
+
comma = match.group(5)
|
|
198
|
+
new_line = f'{whitespace}"{name}{dep_operator}{new_version}"{comma}'
|
|
196
199
|
new_lines.append(new_line)
|
|
197
200
|
else:
|
|
198
201
|
new_lines.append(line)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: scriptcollection
|
|
3
|
-
Version: 4.2.
|
|
3
|
+
Version: 4.2.112
|
|
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
|
|
@@ -6,7 +6,7 @@ Other/QualityCheck/RunTestcases.py,sha256=3vJBquOr9q1DhF4648FhY_sXS-DV_l193mE_O9
|
|
|
6
6
|
Other/Reference/GenerateReference.py,sha256=MFzu7U1OHxgecYDi7WSulO8XRGBsgkdqV_r_jkyVF7c,369
|
|
7
7
|
ScriptCollection/AnionBuildPlatform.py,sha256=OnL0V0jFGrT3ZbCRamy4LBmeGUu-cBFMbk1bhs_S64k,11781
|
|
8
8
|
ScriptCollection/CertificateUpdater.py,sha256=dR5JpJDlZdjD4_pgMz7zCrt1IM7VfatmK6pULSczxQw,9693
|
|
9
|
-
ScriptCollection/Executables.py,sha256=
|
|
9
|
+
ScriptCollection/Executables.py,sha256=3-i1P60XxxoSl1meTdh-9cu9P6QuxOqa6rD7XoEI-Fo,47705
|
|
10
10
|
ScriptCollection/GeneralUtilities.py,sha256=4BmzJhTPAZmKQd5YlMuX0E5Dl6fhuVkmVaCpST0WzRk,67654
|
|
11
11
|
ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
|
|
12
12
|
ScriptCollection/ProcessesRunner.py,sha256=o5raxIt3lknNPoPrjNzJ2bprRPJ3SnL0rrR7crraD7E,1523
|
|
@@ -15,7 +15,7 @@ ScriptCollection/ProgramRunnerMock.py,sha256=uTu-aFle1W_oKjeQEmuPsFPQpvo0kRf2FrR
|
|
|
15
15
|
ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
|
|
16
16
|
ScriptCollection/ProgramRunnerSudo.py,sha256=_khC3xuTdrPoLluBJZWfldltmmuKltABJPcbjZSFW-4,4835
|
|
17
17
|
ScriptCollection/SCLog.py,sha256=8TRy1LeYMsPOIuWUcnUNNbO5pd-cNBS-3cn-kdzP8FU,4768
|
|
18
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
18
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=2vnqwPZhXGbIALmKv4PIyPmp2LtmyYwX4gjhfljZ6iU,188782
|
|
19
19
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
20
20
|
ScriptCollection/OCIImages/AbstractImageHandler.py,sha256=o129UYDtLymCRjMZBP9Puaj19ueMHoNt6UTLspfnaRc,1758
|
|
21
21
|
ScriptCollection/OCIImages/OCIImageManager.py,sha256=2muW4hJ_a7EfavY3WVnafqZ0HC87RcZsoTuNvA3c0To,11175
|
|
@@ -55,7 +55,7 @@ ScriptCollection/TFCPS/Maven/TFCPS_CodeUnitSpecific_Maven.py,sha256=WcWWtCV3GkAk
|
|
|
55
55
|
ScriptCollection/TFCPS/Maven/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
56
56
|
ScriptCollection/TFCPS/NodeJS/TFCPS_CodeUnitSpecific_NodeJS.py,sha256=57I7xbLtCtH-Edt1QKCSXF7wnGyAhbGMdghD_VFZIIY,13184
|
|
57
57
|
ScriptCollection/TFCPS/NodeJS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
58
|
-
ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=
|
|
58
|
+
ScriptCollection/TFCPS/Python/TFCPS_CodeUnitSpecific_Python.py,sha256=s5tgK8A4tdVVGx00FD7M1qvrT0QeGDq6YuqjteXE_z8,13904
|
|
59
59
|
ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
60
60
|
ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
61
61
|
ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -291,8 +291,8 @@ build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/TFCPS_Code
|
|
|
291
291
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
292
292
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=WhOsMpJxNGqnQGA3nJ99ruyqymxBeJxCcpK98zJduTo,1680
|
|
293
293
|
build/lib/build/lib/build/lib/build/lib/ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
294
|
-
scriptcollection-4.2.
|
|
295
|
-
scriptcollection-4.2.
|
|
296
|
-
scriptcollection-4.2.
|
|
297
|
-
scriptcollection-4.2.
|
|
298
|
-
scriptcollection-4.2.
|
|
294
|
+
scriptcollection-4.2.112.dist-info/METADATA,sha256=RXbRh94Hefh_gtYutiBd4V4YDPPnYVBGOHUr7sLEauo,7697
|
|
295
|
+
scriptcollection-4.2.112.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
296
|
+
scriptcollection-4.2.112.dist-info/entry_points.txt,sha256=_vnVTrGJc_z-DTPLvaYyyOpDEQLz0bdO2OLN3_ZmeR8,4978
|
|
297
|
+
scriptcollection-4.2.112.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
298
|
+
scriptcollection-4.2.112.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|