Skip to content

Commit 221420c

Browse files
bdrx312dwoz
bdrx312
authored and
dwoz
committed
Use importlib.metadata for python >= 3.10
Add slots to DependencyGraph Pinned networkx to 3.1 Pinned networkx to latest version supported on python 3.8 to support running salt-ssh to systems with python 3.8 Fixed assignment of env in support helpers VirtualEnv Restrict networkx version with contraints instead of in base Fixed setting context retcode in some places where errors are returned. Removed unnecessary pylint ignore comment. Reverted importlib-metadata version bump. Added networkx to versions report Actually fixed VirtualEnv env assignment from kwargs
1 parent 66caa58 commit 221420c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+149
-131
lines changed

‎requirements/base.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ jmespath
55
msgpack>=1.0.0
66
PyYAML
77
MarkupSafe
8+
# pin to a version available on all supported python versions so salt-ssh can run on older targets
89
networkx
910
requests>=2.31.0 ; python_version < '3.8'
1011
requests>=2.32.0 ; python_version >= '3.8'
@@ -26,7 +27,7 @@ pyopenssl>=24.0.0
2627
python-dateutil>=2.8.1
2728
python-gnupg>=0.4.7
2829
cherrypy>=18.6.1
29-
importlib-metadata>=4.3.0
30+
importlib-metadata>=3.3.0
3031
cryptography>=42.0.0
3132

3233
# From old requirements/static/pkg/linux.in

‎requirements/constraints.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
setuptools >= 65.6.3,< 69.0
22
setuptools-scm < 8.0.0
33
pip >= 23.3,< 24.0
4+
# Restrict to a version that works on all supported python versions so salt-ssh can run on older targets
5+
networkx >= 3.0,< 3.2

‎requirements/static/ci/py3.10/darwin.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,9 @@ netmiko==4.2.0
282282
# via napalm
283283
netutils==1.6.0
284284
# via napalm
285-
networkx==3.2.1
285+
networkx==3.1
286286
# via
287+
# -c requirements/constraints.txt
287288
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
288289
# -r requirements/base.txt
289290
ntc-templates==4.0.1

‎requirements/static/ci/py3.10/freebsd.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,9 @@ netmiko==4.2.0
285285
# via napalm
286286
netutils==1.6.0
287287
# via napalm
288-
networkx==3.2.1
288+
networkx==3.1
289289
# via
290+
# -c requirements/constraints.txt
290291
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
291292
# -r requirements/base.txt
292293
ntc-templates==4.0.1

‎requirements/static/ci/py3.10/linux.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,9 @@ netmiko==4.2.0
310310
# via napalm
311311
netutils==1.6.0
312312
# via napalm
313-
networkx==3.2.1
313+
networkx==3.1
314314
# via
315+
# -c requirements/constraints.txt
315316
# -c requirements/static/ci/../pkg/py3.10/linux.txt
316317
# -r requirements/base.txt
317318
ntc-templates==4.0.1

‎requirements/static/ci/py3.10/windows.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ multidict==6.0.4
253253
# -c requirements/static/ci/../pkg/py3.10/windows.txt
254254
# aiohttp
255255
# yarl
256-
networkx==3.2.1
256+
networkx==3.1
257257
# via
258+
# -c requirements/constraints.txt
258259
# -c requirements/static/ci/../pkg/py3.10/windows.txt
259260
# -r requirements/base.txt
260261
packaging==23.1

‎requirements/static/ci/py3.11/darwin.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,9 @@ netmiko==4.2.0
275275
# via napalm
276276
netutils==1.6.0
277277
# via napalm
278-
networkx==3.2.1
278+
networkx==3.1
279279
# via
280+
# -c requirements/constraints.txt
280281
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
281282
# -r requirements/base.txt
282283
ntc-templates==4.0.1

‎requirements/static/ci/py3.11/freebsd.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,9 @@ netmiko==4.2.0
278278
# via napalm
279279
netutils==1.6.0
280280
# via napalm
281-
networkx==3.2.1
281+
networkx==3.1
282282
# via
283+
# -c requirements/constraints.txt
283284
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
284285
# -r requirements/base.txt
285286
ntc-templates==4.0.1

‎requirements/static/ci/py3.11/linux.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,9 @@ netmiko==4.2.0
301301
# via napalm
302302
netutils==1.6.0
303303
# via napalm
304-
networkx==3.2.1
304+
networkx==3.1
305305
# via
306+
# -c requirements/constraints.txt
306307
# -c requirements/static/ci/../pkg/py3.11/linux.txt
307308
# -r requirements/base.txt
308309
ntc-templates==4.0.1

‎requirements/static/ci/py3.11/windows.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ multidict==6.0.4
246246
# -c requirements/static/ci/../pkg/py3.11/windows.txt
247247
# aiohttp
248248
# yarl
249-
networkx==3.2.1
249+
networkx==3.1
250250
# via
251+
# -c requirements/constraints.txt
251252
# -c requirements/static/ci/../pkg/py3.11/windows.txt
252253
# -r requirements/base.txt
253254
packaging==23.1

‎requirements/static/ci/py3.12/cloud.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,9 @@ netutils==1.6.0
385385
# via
386386
# -c requirements/static/ci/py3.12/linux.txt
387387
# napalm
388-
networkx==3.2.1
388+
networkx==3.1
389389
# via
390+
# -c requirements/constraints.txt
390391
# -c requirements/static/ci/../pkg/py3.12/linux.txt
391392
# -c requirements/static/ci/py3.12/linux.txt
392393
# -r requirements/base.txt

‎requirements/static/ci/py3.12/darwin.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,9 @@ netmiko==4.2.0
275275
# via napalm
276276
netutils==1.6.0
277277
# via napalm
278-
networkx==3.2.1
278+
networkx==3.1
279279
# via
280+
# -c requirements/constraints.txt
280281
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
281282
# -r requirements/base.txt
282283
ntc-templates==4.0.1

‎requirements/static/ci/py3.12/docs.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ multidict==6.0.4
158158
# yarl
159159
myst-docutils[linkify]==1.0.0
160160
# via -r requirements/static/ci/docs.in
161-
networkx==3.2.1
161+
networkx==3.1
162162
# via
163+
# -c requirements/constraints.txt
163164
# -c requirements/static/ci/py3.12/linux.txt
164165
# -r requirements/base.txt
165166
packaging==23.1

‎requirements/static/ci/py3.12/freebsd.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,9 @@ netmiko==4.2.0
278278
# via napalm
279279
netutils==1.6.0
280280
# via napalm
281-
networkx==3.2.1
281+
networkx==3.1
282282
# via
283+
# -c requirements/constraints.txt
283284
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
284285
# -r requirements/base.txt
285286
ntc-templates==4.0.1

‎requirements/static/ci/py3.12/lint.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,9 @@ netutils==1.6.0
412412
# via
413413
# -c requirements/static/ci/py3.12/linux.txt
414414
# napalm
415-
networkx==3.2.1
415+
networkx==3.1
416416
# via
417+
# -c requirements/constraints.txt
417418
# -c requirements/static/ci/../pkg/py3.12/linux.txt
418419
# -c requirements/static/ci/py3.12/linux.txt
419420
# -r requirements/base.txt

‎requirements/static/ci/py3.12/linux.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,9 @@ netmiko==4.2.0
301301
# via napalm
302302
netutils==1.6.0
303303
# via napalm
304-
networkx==3.2.1
304+
networkx==3.1
305305
# via
306+
# -c requirements/constraints.txt
306307
# -c requirements/static/ci/../pkg/py3.12/linux.txt
307308
# -r requirements/base.txt
308309
ntc-templates==4.0.1

‎requirements/static/ci/py3.12/windows.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ multidict==6.0.4
246246
# -c requirements/static/ci/../pkg/py3.12/windows.txt
247247
# aiohttp
248248
# yarl
249-
networkx==3.2.1
249+
networkx==3.1
250250
# via
251+
# -c requirements/constraints.txt
251252
# -c requirements/static/ci/../pkg/py3.12/windows.txt
252253
# -r requirements/base.txt
253254
packaging==23.1

‎requirements/static/ci/py3.8/freebsd.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ netutils==1.6.0
291291
# via napalm
292292
networkx==3.1
293293
# via
294+
# -c requirements/constraints.txt
294295
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
295296
# -r requirements/base.txt
296297
ntc-templates==4.0.1

‎requirements/static/ci/py3.8/linux.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ netutils==1.6.0
310310
# via napalm
311311
networkx==3.1
312312
# via
313+
# -c requirements/constraints.txt
313314
# -c requirements/static/ci/../pkg/py3.8/linux.txt
314315
# -r requirements/base.txt
315316
ntc-templates==4.0.1

‎requirements/static/ci/py3.8/windows.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ multidict==6.0.4
259259
# yarl
260260
networkx==3.1
261261
# via
262+
# -c requirements/constraints.txt
262263
# -c requirements/static/ci/../pkg/py3.8/windows.txt
263264
# -r requirements/base.txt
264265
packaging==23.1

‎requirements/static/ci/py3.9/darwin.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,9 @@ netmiko==4.2.0
282282
# via napalm
283283
netutils==1.6.0
284284
# via napalm
285-
networkx==3.2.1
285+
networkx==3.1
286286
# via
287+
# -c requirements/constraints.txt
287288
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
288289
# -r requirements/base.txt
289290
ntc-templates==4.0.1

‎requirements/static/ci/py3.9/freebsd.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,9 @@ netmiko==4.2.0
285285
# via napalm
286286
netutils==1.6.0
287287
# via napalm
288-
networkx==3.2.1
288+
networkx==3.1
289289
# via
290+
# -c requirements/constraints.txt
290291
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
291292
# -r requirements/base.txt
292293
ntc-templates==4.0.1

‎requirements/static/ci/py3.9/linux.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,9 @@ netmiko==4.2.0
304304
# via napalm
305305
netutils==1.6.0
306306
# via napalm
307-
networkx==3.2.1
307+
networkx==3.1
308308
# via
309+
# -c requirements/constraints.txt
309310
# -c requirements/static/ci/../pkg/py3.9/linux.txt
310311
# -r requirements/base.txt
311312
ntc-templates==4.0.1

‎requirements/static/ci/py3.9/windows.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ multidict==6.0.4
253253
# -c requirements/static/ci/../pkg/py3.9/windows.txt
254254
# aiohttp
255255
# yarl
256-
networkx==3.2.1
256+
networkx==3.1
257257
# via
258+
# -c requirements/constraints.txt
258259
# -c requirements/static/ci/../pkg/py3.9/windows.txt
259260
# -r requirements/base.txt
260261
packaging==23.1

‎requirements/static/pkg/py3.10/darwin.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ multidict==6.0.4
8383
# via
8484
# aiohttp
8585
# yarl
86-
networkx==3.2.1
87-
# via -r requirements/base.txt
86+
networkx==3.1
87+
# via
88+
# -c requirements/constraints.txt
89+
# -r requirements/base.txt
8890
packaging==23.1
8991
# via -r requirements/base.txt
9092
portend==3.1.0

‎requirements/static/pkg/py3.10/freebsd.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ multidict==6.0.4
8383
# via
8484
# aiohttp
8585
# yarl
86-
networkx==3.2.1
87-
# via -r requirements/base.txt
86+
networkx==3.1
87+
# via
88+
# -c requirements/constraints.txt
89+
# -r requirements/base.txt
8890
packaging==23.1
8991
# via -r requirements/base.txt
9092
portend==3.1.0

‎requirements/static/pkg/py3.10/linux.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ multidict==6.0.4
8383
# via
8484
# aiohttp
8585
# yarl
86-
networkx==3.2.1
87-
# via -r requirements/base.txt
86+
networkx==3.1
87+
# via
88+
# -c requirements/constraints.txt
89+
# -r requirements/base.txt
8890
packaging==23.1
8991
# via -r requirements/base.txt
9092
portend==3.1.0

‎requirements/static/pkg/py3.10/windows.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ multidict==6.0.4
9191
# via
9292
# aiohttp
9393
# yarl
94-
networkx==3.2.1
95-
# via -r requirements/base.txt
94+
networkx==3.1
95+
# via
96+
# -c requirements/constraints.txt
97+
# -r requirements/base.txt
9698
packaging==23.1
9799
# via -r requirements/base.txt
98100
portend==3.1.0

‎requirements/static/pkg/py3.11/darwin.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

‎requirements/static/pkg/py3.11/freebsd.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

‎requirements/static/pkg/py3.11/linux.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

‎requirements/static/pkg/py3.11/windows.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ multidict==6.0.4
8989
# via
9090
# aiohttp
9191
# yarl
92-
networkx==3.2.1
93-
# via -r requirements/base.txt
92+
networkx==3.1
93+
# via
94+
# -c requirements/constraints.txt
95+
# -r requirements/base.txt
9496
packaging==23.1
9597
# via -r requirements/base.txt
9698
portend==3.1.0

‎requirements/static/pkg/py3.12/darwin.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

‎requirements/static/pkg/py3.12/freebsd.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

‎requirements/static/pkg/py3.12/linux.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ multidict==6.0.4
8181
# via
8282
# aiohttp
8383
# yarl
84-
networkx==3.2.1
85-
# via -r requirements/base.txt
84+
networkx==3.1
85+
# via
86+
# -c requirements/constraints.txt
87+
# -r requirements/base.txt
8688
packaging==23.1
8789
# via -r requirements/base.txt
8890
portend==3.1.0

0 commit comments

Comments
 (0)