From c61822fbd9f1316b9d0c44ebd2d93f262179eb38 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Wed, 23 Oct 2024 13:12:15 -0600 Subject: [PATCH] Updates due to pytest-shell-utilities and psutil version updates --- requirements/base.txt | 5 ++--- requirements/pytest.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 6 +++--- requirements/static/ci/py3.10/darwin.txt | 12 ++++++------ requirements/static/ci/py3.10/docs.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 12 ++++++------ requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 12 ++++++------ requirements/static/ci/py3.10/windows.txt | 12 ++++++------ requirements/static/ci/py3.11/cloud.txt | 6 +++--- requirements/static/ci/py3.11/darwin.txt | 12 ++++++------ requirements/static/ci/py3.11/docs.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 12 ++++++------ requirements/static/ci/py3.11/lint.txt | 2 +- requirements/static/ci/py3.11/linux.txt | 12 ++++++------ requirements/static/ci/py3.11/windows.txt | 12 ++++++------ requirements/static/ci/py3.12/cloud.txt | 6 +++--- requirements/static/ci/py3.12/darwin.txt | 12 ++++++------ requirements/static/ci/py3.12/docs.txt | 2 +- requirements/static/ci/py3.12/freebsd.txt | 12 ++++++------ requirements/static/ci/py3.12/lint.txt | 2 +- requirements/static/ci/py3.12/linux.txt | 12 ++++++------ requirements/static/ci/py3.12/windows.txt | 12 ++++++------ requirements/static/ci/py3.7/cloud.txt | 5 +++-- requirements/static/ci/py3.7/docs.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 8 +++++--- requirements/static/ci/py3.7/linux.txt | 8 +++++--- requirements/static/ci/py3.7/windows.txt | 8 +++++--- requirements/static/ci/py3.8/cloud.txt | 5 +++-- requirements/static/ci/py3.8/docs.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 8 +++++--- requirements/static/ci/py3.8/lint.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 8 +++++--- requirements/static/ci/py3.8/windows.txt | 8 +++++--- requirements/static/ci/py3.9/cloud.txt | 5 +++-- requirements/static/ci/py3.9/darwin.txt | 8 +++++--- requirements/static/ci/py3.9/docs.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 8 +++++--- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 8 +++++--- requirements/static/ci/py3.9/windows.txt | 8 +++++--- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.12/darwin.txt | 2 +- requirements/static/pkg/py3.12/freebsd.txt | 2 +- requirements/static/pkg/py3.12/linux.txt | 2 +- requirements/static/pkg/py3.12/windows.txt | 2 +- requirements/static/pkg/py3.7/freebsd.txt | 2 +- requirements/static/pkg/py3.7/linux.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- salt/modules/selinux.py | 6 +++--- 64 files changed, 180 insertions(+), 156 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 297a09c552f..91e74a2ba8d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 diff --git a/requirements/pytest.txt b/requirements/pytest.txt index 82dd9138958..a8a26ea3892 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -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' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 3a2c719a8d5..d40e35e3fea 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 54d1f72b7a4..4a24aabb2a4 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 61bcc2a3ae4..26970270a34 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 606d008f123..1a8587f2655 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index de2938cbbe9..041231763c9 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index af24f415236..8a573d009a4 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index bf76db6faaa..3c271b0cd41 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index f5c041d3a79..460da41efc8 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 7978a04548e..376053f2348 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 867425b46fa..4d78150e436 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 6551c7d93c0..f2822d4a2ad 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 308e35d7efd..525ba97b080 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 9f5b799915d..9887856537c 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 404f5dc466c..9fee82fa466 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index cd8e72df21c..efbaf7aca33 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 99f9d586134..b3f19156670 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index d24684e2003..3c536f15de8 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 139b0f3983c..74142860bb0 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index e2716231a2a..b796d01ed4c 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 2c554389a72..c21d0cac0dd 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index dc107b92842..5affc00a7f0 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index e87c4eaa91e..9280c610e40 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 42fa1b1696a..b0ac8d78ed8 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index 88e21e1e582..394bc0b38b3 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index a48164f63b4..53e6a0598ad 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index f22afea47e2..3be85a5d491 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index f806f65c613..9f18c56bb16 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 3134d405242..7f440e0dc0f 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 639b2ce154d..e42ad37bd0f 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index b6897f97921..7b6ffbbfde6 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 2350dfa9052..6a9dcd361f7 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index e44bbe656e4..f38be0bcc27 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 75ac8316a38..b24fdf78b10 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 0dbaf30bdbd..66bddbb9630 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -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 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 5e674f69410..9b9f3136276 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index e233eb1b3e0..c7a81642b26 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -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 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index b2bcfb09f42..d23f65943db 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index dc999138691..fd5f770ef99 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 1b23482691d..5c9bd25c8ef 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 53967f0dcfd..ccb85c35ee2 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -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 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index b60e8945f50..332e944ecf5 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 2cf0395a141..4708e14af5d 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 7a6e6563dd9..ee99032daec 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 0da77bec7e4..81f74925606 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -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 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 9dd3a89c320..ddfb15ab43b 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index f48061650e3..c77f1b8293f 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index bb03cc09756..95f415ad362 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index e60e9f5f8b0..27c282a6798 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -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 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index e62d9bfb9a5..2a361dec5a4 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index b088f3d1946..af50baf542e 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 17149a2d305..dc7316cff1d 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 5d120c36327..5140b00211e 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 389e48b4a03..41e6230e660 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index 931d116dada..09b5efed8d4 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 8d12dd9b308..bdc6fa9ee05 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index e932b40b90d..81f0e4c6d5c 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 68e50b0975b..6a848bf5530 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 54953b71c13..3f0e827f089 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -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 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 8e073a8c7f1..78dbbf27f28 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -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 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index aea758e5bbe..3f0c1b8b138 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -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 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 924eccd59a2..afa060a8fef 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -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 diff --git a/salt/modules/selinux.py b/salt/modules/selinux.py index f1c98f91702..44e0bd48b30 100644 --- a/salt/modules/selinux.py +++ b/salt/modules/selinux.py @@ -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 )