Skip to content

Commit

Permalink
Use importlib.metadata for python >= 3.10
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@bdrx312 @dwoz
bdrx312 authored and dwoz committed Oct 10, 2024
1 parent 66caa58 commit 221420c
Show file tree
Hide file tree
Showing 51 changed files with 149 additions and 131 deletions.
3 changes: 2 additions & 1 deletion requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ jmespath
msgpack>=1.0.0
PyYAML
MarkupSafe
# pin to a version available on all supported python versions so salt-ssh can run on older targets
networkx
requests>=2.31.0 ; python_version < '3.8'
requests>=2.32.0 ; python_version >= '3.8'
Expand All @@ -26,7 +27,7 @@ pyopenssl>=24.0.0
python-dateutil>=2.8.1
python-gnupg>=0.4.7
cherrypy>=18.6.1
importlib-metadata>=4.3.0
importlib-metadata>=3.3.0
cryptography>=42.0.0

# From old requirements/static/pkg/linux.in
Expand Down
2 changes: 2 additions & 0 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
setuptools >= 65.6.3,< 69.0
setuptools-scm < 8.0.0
pip >= 23.3,< 24.0
# Restrict to a version that works on all supported python versions so salt-ssh can run on older targets
networkx >= 3.0,< 3.2
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.10/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.10/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.10/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.10/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,9 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
# yarl
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.11/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.11/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.11/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.11/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,9 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# yarl
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/cloud.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,9 @@ netutils==1.6.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@ multidict==6.0.4
# yarl
myst-docutils[linkify]==1.0.0
# via -r requirements/static/ci/docs.in
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/lint.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,9 @@ netutils==1.6.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,9 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# aiohttp
# yarl
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
1 change: 1 addition & 0 deletions requirements/static/ci/py3.8/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ netutils==1.6.0
# via napalm
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
1 change: 1 addition & 0 deletions requirements/static/ci/py3.8/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ netutils==1.6.0
# via napalm
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
1 change: 1 addition & 0 deletions requirements/static/ci/py3.8/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ multidict==6.0.4
# yarl
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.9/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.9/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.9/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,9 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
ntc-templates==4.0.1
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.9/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,9 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
# yarl
networkx==3.2.1
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
packaging==23.1
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.10/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.10/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.10/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.10/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.11/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.11/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.11/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.11/windows.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.12/darwin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.12/freebsd.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
6 changes: 4 additions & 2 deletions requirements/static/pkg/py3.12/linux.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
networkx==3.2.1
# via -r requirements/base.txt
networkx==3.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
packaging==23.1
# via -r requirements/base.txt
portend==3.1.0
Expand Down
Loading

0 comments on commit 221420c

Please sign in to comment.