Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Fix requisite performance issues and aggregation #66135

Merged
merged 2 commits into from
Oct 10, 2024
Merged

[master] Fix requisite performance issues and aggregation #66135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24cd1ef
Fix issues with requisites and aggregate
bdrx312 Apr 20, 2024
6f12f34
Use importlib.metadata for python >= 3.10
bdrx312 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ repos:
hooks:
- id: pyupgrade
name: Upgrade code for Py3.8+
args: [--py38-plus, --keep-mock]
args: [--py38-plus, --keep-mock, --keep-runtime-typing]
exclude: >
(?x)^(
salt/client/ssh/ssh_py_shim.py
Expand Down
3 changes: 2 additions & 1 deletion .pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,4 +761,5 @@ allowed-3rd-party-modules=msgpack,
pytestskipmarkers,
cryptography,
aiohttp,
pytest_timeout
pytest_timeout,
networkx
1 change: 1 addition & 0 deletions changelog/47154.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed erroneous recursive requisite error when a prereq is used in combination with onchanges_any.
1 change: 1 addition & 0 deletions changelog/59123.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed dependency resolution to not be quadratic.
1 change: 1 addition & 0 deletions changelog/62439.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed performance when state_aggregate is enabled.
2 changes: 1 addition & 1 deletion changelog/65304.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pkg.installed state aggregate does not honors requires requisite
Fixed aggregation to correctly honor requisites.
1 change: 1 addition & 0 deletions changelog/8210.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed recursive prereq requisites to report recursive requisite error.
2 changes: 2 additions & 0 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ 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'
distro>=1.0.1
Expand Down
2 changes: 2 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
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
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.10/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,11 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
# yarl
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.11/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.11/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.11/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.11/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# aiohttp
# yarl
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
Expand Down
6 changes: 6 additions & 0 deletions requirements/static/ci/py3.12/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,12 @@ netutils==1.6.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# napalm
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
ntc-templates==4.0.1
# via
# -c requirements/static/ci/py3.12/linux.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.12/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.12/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ multidict==6.0.4
# yarl
myst-docutils[linkify]==1.0.0
# via -r requirements/static/ci/docs.in
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
packaging==23.1
# via
# -c requirements/static/ci/py3.12/linux.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.12/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
6 changes: 6 additions & 0 deletions requirements/static/ci/py3.12/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,12 @@ netutils==1.6.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# napalm
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
ntc-templates==4.0.1
# via
# -c requirements/static/ci/py3.12/linux.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.12/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.12/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# aiohttp
# yarl
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.8/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ netmiko==4.2.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.8/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,11 @@ netmiko==4.2.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.8/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,11 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
# 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
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.9/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.9/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.9/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ netmiko==4.2.0
# via napalm
netutils==1.6.0
# via napalm
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
# via netmiko
oscrypto==1.3.0
Expand Down
5 changes: 5 additions & 0 deletions requirements/static/ci/py3.9/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,11 @@ multidict==6.0.4
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
# yarl
networkx==3.1
# via
# -c requirements/constraints.txt
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
Expand Down
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.10/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.11/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.11/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.11/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
4 changes: 4 additions & 0 deletions requirements/static/pkg/py3.11/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ multidict==6.0.4
# via
# aiohttp
# yarl
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
Loading