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

[3007.x] Merge forward 3006.x into 3007.x #67002

Open
wants to merge 24 commits into
base: 3007.x
Choose a base branch
from
+670 −304
Open

[3007.x] Merge forward 3006.x into 3007.x #67002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e3f2596
Regularize yumpkg option separators
ben-grande Oct 15, 2024
30e0de3
Remove wmic usage from disk grains on Windows
twangboy Oct 14, 2024
6caf16d
Remove unused import
twangboy Oct 14, 2024
98f49eb
Remove wmic from iscsi grains
twangboy Oct 15, 2024
4e429ef
Remove perms from linux_acl.list_absent docstring
tacerus Sep 15, 2024
628c2d2
Add cryptography back as a dependency for Salt 3006 to base.txt requi…
dmurphy18 Oct 17, 2024
3b8c57e
Add test for saltclass nested classes expansion
baby-gnu Sep 26, 2024
9ef879a
fix(saltclass): don't lose nested classes and states in recursion
baby-gnu Sep 26, 2024
d1ca30c
Fix incorrect override of minion node definition
baby-gnu Sep 26, 2024
6e4f178
Remove expand_classes_in_order from missing_docstrings
baby-gnu Sep 26, 2024
983cfe7
fixes #66252 correct use of egrep to parse semanage output
ndptech Mar 21, 2024
eee8215
Skip tests unless on Linux
twangboy Jun 28, 2024
e4b4f57
Fix nightly builds and update psutil to 6.0.0 or greater
dmurphy18 Oct 22, 2024
a8a73c4
Revert psutil dependency back to greater than 5.0.0
dmurphy18 Oct 22, 2024
bbd061b
Forcing rebuild
dmurphy18 Oct 23, 2024
c61822f
Updates due to pytest-shell-utilities and psutil version updates
dmurphy18 Oct 23, 2024
d192585
Adjusted selinux and tests for egrep to grep -E
dmurphy18 Oct 23, 2024
ed89424
Updated selinux commands and tests after reviewer comments, need the …
dmurphy18 Oct 24, 2024
931e463
Add test for issue #66996
lkubb Oct 24, 2024
0e3d73e
Fix parallel states on spawning platforms in general
lkubb Oct 24, 2024
c4361cf
Ensure injected globals are defined on spawning platforms
lkubb Oct 24, 2024
a275498
Add test for issue #66999
lkubb Oct 24, 2024
fd7b0dc
Filter unpicklable objects from the context dict when necessary
lkubb Oct 24, 2024
1a83476
Merge branch '3006.x' into merge/3007.x/3006.x
dwoz Oct 25, 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
4 changes: 4 additions & 0 deletions changelog/58969.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Issue 58969: Fixes an issue with `saltclass.expand_classes_in_order`
function where it was losing nested classes states during class
expansion. The logic now use `salt.utils.odict.OrderedDict` to keep
the inclusion ordering.
4 changes: 4 additions & 0 deletions changelog/63933.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Issue 63933: Fixes an issue with `saltclass.expanded_dict_from_minion`
function where it was passing a reference to minion `dict` which was
overridden by nested classes during class expansion. Copy the node
definition with `copy.deepcopy` instead of passing a reference.
1 change: 1 addition & 0 deletions changelog/66252.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Applying `selinux.fcontext_policy_present` to a shorter path than an existing entry now works
1 change: 1 addition & 0 deletions changelog/66883.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added cryptogrpahy back to base.txt requirements as a dependency
1 change: 1 addition & 0 deletions changelog/66891.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove "perms" from `linux_acl.list_absent()` documentation
2 changes: 2 additions & 0 deletions changelog/66959.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Removed the usage of wmic to get the disk and iscsi grains for Windows. The wmic
binary is being deprecated.
1 change: 1 addition & 0 deletions changelog/66996.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensured global dunders like __env__ are defined in state module that are run in parallel on spawning platforms
1 change: 1 addition & 0 deletions changelog/66999.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Filtered unpicklable objects from the context dict when invoking states in parallel on spawning platforms to avoid a crash
3 changes: 2 additions & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ requests>=2.32.3 ; python_version >= '3.10'
certifi==2023.07.22; python_version < '3.10'
certifi>=2024.7.4; python_version >= '3.10'
distro>=1.0.1
psutil>=5.0.0
psutil<6.0.0; python_version <= '3.9'
psutil>=5.0.0; python_version >= '3.10'
packaging>=21.3
looseversion
tornado>=6.3.3
Expand Down
2 changes: 2 additions & 0 deletions requirements/pytest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ pyfakefs
trustme
pytest-skip-markers >= 1.5.2 ; python_version >= '3.8'
pytest-skip-markers <= 1.5.1 ; python_version < '3.8'
pytest-shell-utilities <= 1.9.0; python_version <= '3.9'
pytest-shell-utilities >= 1.9.7; python_version >= '3.10'
9 changes: 5 additions & 4 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 @@ -310,7 +310,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -373,8 +373,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -534,7 +536,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -314,7 +314,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -377,8 +377,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -539,7 +541,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -340,7 +340,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -411,8 +411,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -603,7 +605,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -272,7 +272,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -335,8 +335,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -486,7 +488,6 @@ typing-extensions==4.8.0
# inflect
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -303,7 +303,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -366,8 +366,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -525,7 +527,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -307,7 +307,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -370,8 +370,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -531,7 +533,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -331,7 +331,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -402,8 +402,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -593,7 +595,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -265,7 +265,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -328,8 +328,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -477,7 +479,6 @@ typing-extensions==4.8.0
# inflect
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
6 changes: 3 additions & 3 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 @@ -427,7 +427,7 @@ portend==3.1.0
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
Expand Down Expand Up @@ -525,9 +525,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
Expand Down Expand Up @@ -758,7 +759,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
9 changes: 5 additions & 4 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 @@ -303,7 +303,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -366,8 +366,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -525,7 +527,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
Expand Down
9 changes: 5 additions & 4 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 @@ -307,7 +307,7 @@ portend==3.1.0
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -370,8 +370,10 @@ pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt
Expand Down Expand Up @@ -531,7 +533,6 @@ typing-extensions==4.8.0
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ portend==3.1.0
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# cherrypy
psutil==5.9.6
psutil==5.9.6 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
Expand Down
Loading
Loading