saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updates due to pytest-shell-utilities and psutil version updates

Browse source
This commit is contained in:
David Murphy 2024-10-23 13:12:15 -06:00 • committed by Daniel Wozniak
parent bbd061b47b
commit c61822fbd9
64 changed files with 180 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
requirements/base.txt
View file

@ -10,12 +10,11 @@ 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
croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
# We need contextvars for salt-ssh
contextvars
cryptography>=42.0.0
# force rebuild

2
requirements/pytest.txt
View file

@ -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'

6
requirements/static/ci/py3.10/cloud.txt
View file

@ -395,7 +395,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
@ -479,9 +479,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.10/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.10/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
@ -689,7 +690,6 @@ trustme==1.1.0
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via

12
requirements/static/ci/py3.10/darwin.txt
View file

@ -281,7 +281,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
@ -336,8 +336,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
@ -475,9 +477,7 @@ transitions==0.8.9
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt

2
requirements/static/ci/py3.10/docs.txt
View file

@ -126,7 +126,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt

12
requirements/static/ci/py3.10/freebsd.txt
View file

@ -274,7 +274,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
@ -329,8 +329,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
@ -467,9 +469,7 @@ transitions==0.8.9
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt

2
requirements/static/ci/py3.10/lint.txt
View file

@ -395,7 +395,7 @@ portend==2.4
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt

12
requirements/static/ci/py3.10/linux.txt
View file

@ -285,7 +285,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
@ -346,8 +346,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
@ -514,9 +516,7 @@ trustme==1.1.0
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
tzlocal==3.0
# via apscheduler
urllib3==1.26.18

12
requirements/static/ci/py3.10/windows.txt
View file

@ -254,7 +254,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
@ -307,8 +307,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
@ -450,9 +452,7 @@ tomli==2.0.1
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.4.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt

6
requirements/static/ci/py3.11/cloud.txt
View file

@ -367,7 +367,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt
@ -443,9 +443,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.11/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.11/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
@ -636,7 +637,6 @@ trustme==1.1.0
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via

12
requirements/static/ci/py3.11/darwin.txt
View file

@ -258,7 +258,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
@ -307,8 +307,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
@ -436,9 +438,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt

2
requirements/static/ci/py3.11/docs.txt
View file

@ -126,7 +126,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.11/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt

12
requirements/static/ci/py3.11/freebsd.txt
View file

@ -255,7 +255,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
@ -306,8 +306,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
@ -433,9 +435,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt

2
requirements/static/ci/py3.11/lint.txt
View file

@ -370,7 +370,7 @@ portend==2.4
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -c requirements/static/ci/py3.11/linux.txt

12
requirements/static/ci/py3.11/linux.txt
View file

@ -266,7 +266,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
@ -323,8 +323,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
@ -480,9 +482,7 @@ trustme==1.1.0
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
tzlocal==3.0
# via apscheduler
urllib3==1.26.18

12
requirements/static/ci/py3.11/windows.txt
View file

@ -250,7 +250,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
@ -303,8 +303,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
@ -444,9 +446,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.4.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt

6
requirements/static/ci/py3.12/cloud.txt
View file

@ -367,7 +367,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
@ -443,9 +443,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
@ -636,7 +637,6 @@ trustme==1.1.0
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18
# via

12
requirements/static/ci/py3.12/darwin.txt
View file

@ -258,7 +258,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
@ -307,8 +307,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
@ -436,9 +438,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.2.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt

2
requirements/static/ci/py3.12/docs.txt
View file

@ -126,7 +126,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt

12
requirements/static/ci/py3.12/freebsd.txt
View file

@ -255,7 +255,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
@ -306,8 +306,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
@ -433,9 +435,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt

2
requirements/static/ci/py3.12/lint.txt
View file

@ -370,7 +370,7 @@ portend==2.4
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt

12
requirements/static/ci/py3.12/linux.txt
View file

@ -266,7 +266,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
@ -323,8 +323,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
@ -480,9 +482,7 @@ trustme==1.1.0
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typing-extensions==4.8.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
tzlocal==3.0
# via apscheduler
urllib3==1.26.18

12
requirements/static/ci/py3.12/windows.txt
View file

@ -250,7 +250,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
@ -303,8 +303,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
@ -444,9 +446,7 @@ toml==0.10.2
trustme==1.1.0
# via -r requirements/pytest.txt
typing-extensions==4.4.0
# via
# pytest-shell-utilities
# pytest-system-statistics
# via pytest-system-statistics
urllib3==1.26.18
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt

5
requirements/static/ci/py3.7/cloud.txt
View file

@ -440,7 +440,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.7/linux.txt
# -c requirements/static/ci/py3.7/linux.txt
@ -527,9 +527,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.7/linux.txt
# -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.7/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.0 ; python_version < "3.8"
# via

2
requirements/static/ci/py3.7/docs.txt
View file

@ -130,7 +130,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.7/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.7/linux.txt
# -r requirements/base.txt

8
requirements/static/ci/py3.7/freebsd.txt
View file

@ -313,7 +313,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.7/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.7/freebsd.txt
# -r requirements/base.txt
@ -370,8 +370,10 @@ pytest-httpserver==1.0.6
# 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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.0 ; python_version < "3.8"
# via
# -r requirements/pytest.txt

8
requirements/static/ci/py3.7/linux.txt
View file

@ -319,7 +319,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.7/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.7/linux.txt
# -r requirements/base.txt
@ -382,8 +382,10 @@ pytest-httpserver==1.0.6
# 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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.0 ; python_version < "3.8"
# via
# -r requirements/pytest.txt

8
requirements/static/ci/py3.7/windows.txt
View file

@ -270,7 +270,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.7/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.7/windows.txt
# -r requirements/base.txt
@ -322,8 +322,10 @@ pytest-httpserver==1.0.6
# 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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.0 ; python_version < "3.8"
# via
# -r requirements/pytest.txt

5
requirements/static/ci/py3.8/cloud.txt
View file

@ -426,7 +426,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -c requirements/static/ci/py3.8/linux.txt
@ -513,9 +513,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via

2
requirements/static/ci/py3.8/docs.txt
View file

@ -126,7 +126,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.8/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/base.txt

8
requirements/static/ci/py3.8/freebsd.txt
View file

@ -299,7 +299,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
@ -356,8 +356,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

2
requirements/static/ci/py3.8/lint.txt
View file

@ -419,7 +419,7 @@ portend==2.4
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -c requirements/static/ci/py3.8/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -c requirements/static/ci/py3.8/linux.txt

8
requirements/static/ci/py3.8/linux.txt
View file

@ -305,7 +305,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
@ -368,8 +368,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

8
requirements/static/ci/py3.8/windows.txt
View file

@ -256,7 +256,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
@ -308,8 +308,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

5
requirements/static/ci/py3.9/cloud.txt
View file

@ -426,7 +426,7 @@ portend==2.4
# cherrypy
profitbricks==4.1.3
# via -r requirements/static/ci/cloud.in
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -c requirements/static/ci/py3.9/linux.txt
@ -515,9 +515,10 @@ pytest-salt-factories==1.0.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via

8
requirements/static/ci/py3.9/darwin.txt
View file

@ -306,7 +306,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
@ -365,8 +365,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

2
requirements/static/ci/py3.9/docs.txt
View file

@ -130,7 +130,7 @@ portend==2.4
# via
# -c requirements/static/ci/py3.9/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/base.txt

8
requirements/static/ci/py3.9/freebsd.txt
View file

@ -299,7 +299,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
@ -358,8 +358,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

2
requirements/static/ci/py3.9/lint.txt
View file

@ -415,7 +415,7 @@ portend==2.4
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -c requirements/static/ci/py3.9/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -c requirements/static/ci/py3.9/linux.txt

8
requirements/static/ci/py3.9/linux.txt
View file

@ -303,7 +303,7 @@ portend==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
@ -368,8 +368,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

8
requirements/static/ci/py3.9/windows.txt
View file

@ -256,7 +256,7 @@ portend==2.6
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
@ -309,8 +309,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.8.0 ; python_version <= "3.9"
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-skip-markers==1.5.2 ; python_version >= "3.8"
# via
# -r requirements/pytest.txt

2
requirements/static/pkg/py3.10/darwin.txt
View file

@ -76,7 +76,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.10/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.10/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

2
requirements/static/pkg/py3.11/darwin.txt
View file

@ -76,7 +76,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.11/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.11/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

2
requirements/static/pkg/py3.12/darwin.txt
View file

@ -76,7 +76,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.12/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.12/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.12/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version >= "3.10"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

2
requirements/static/pkg/py3.7/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.17
# via cffi

2
requirements/static/pkg/py3.7/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.17
# via cffi

2
requirements/static/pkg/py3.7/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

2
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.17
# via cffi

2
requirements/static/pkg/py3.8/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.17
# via cffi

2
requirements/static/pkg/py3.8/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

2
requirements/static/pkg/py3.9/darwin.txt
View file

@ -76,7 +76,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/darwin.txt

2
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -68,7 +68,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.9/linux.txt
View file

@ -66,7 +66,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pycparser==2.21 ; python_version >= "3.9"
# via

2
requirements/static/pkg/py3.9/windows.txt
View file

@ -77,7 +77,7 @@ packaging==22.0
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==6.1.0
psutil==5.8.0 ; python_version <= "3.9"
# via -r requirements/base.txt
pyasn1==0.4.8
# via -r requirements/windows.txt

6
salt/modules/selinux.py
View file

@ -490,7 +490,7 @@ def fcontext_get_policy(
"[[:alpha:] ]+" if filetype is None else filetype_id_to_string(filetype)
)
cmd = (
"semanage fcontext -l | grep -E "
"semanage fcontext -l | egrep "
+ "'^{filespec}{spacer}{filetype}{spacer}{sel_user}:{sel_role}:{sel_type}:{sel_level}{ospacer}$'".format(
**cmd_kwargs
)
@ -616,7 +616,7 @@ def _fcontext_add_or_delete_policy(
if "add" == action:
# need to use --modify if context for name file exists, otherwise ValueError
filespec = re.escape(name)
cmd = f"semanage fcontext -l | grep -E '{filespec} '"
cmd = f"semanage fcontext -l | egrep '{filespec} '"
current_entry_text = __salt__["cmd.shell"](cmd, ignore_retcode=True)
if current_entry_text != "":
action = "modify"
@ -762,7 +762,7 @@ def port_get_policy(name, sel_type=None, protocol=None, port=None):
"port": port,
}
cmd = (
"semanage port -l | grep -E "
"semanage port -l | egrep "
+ "'^{sel_type}{spacer}{protocol}{spacer}((.*)*)[ ]{port}($|,)'".format(
**cmd_kwargs
)