diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7144dfac..6ceb807c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -104,7 +104,7 @@ jobs: Linux-System-Service: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: Pre-Commit timeout-minutes: 25 @@ -191,19 +191,16 @@ jobs: max-parallel: 16 matrix: python-version: - - "3.8" - - "3.9" - "3.10" salt-version: - - "3006.0" - - "3007.0" + - "3006.9" + - "3007.1" pytest-version: - "7.4.0" - "8.0.0" - - "8.1.0" - exclude: - - {"salt-version": "3007.0", "python-version": "3.8"} - - {"salt-version": "3007.0", "python-version": "3.9"} + - "8.1.1" + - "8.2.0" + - "8.3.3" steps: - uses: actions/checkout@v4 @@ -282,14 +279,15 @@ jobs: max-parallel: 16 matrix: python-version: - - "3.9" - "3.10" salt-version: - - "3006.0" + - "3006.9" pytest-version: - "7.4.0" - "8.0.0" - - "8.1.0" + - "8.1.1" + - "8.2.0" + - "8.3.3" steps: - uses: actions/checkout@v4 @@ -354,7 +352,7 @@ jobs: Linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: Pre-Commit timeout-minutes: 25 @@ -364,23 +362,16 @@ jobs: max-parallel: 16 matrix: python-version: - - "3.7" - - "3.8" - - "3.9" - "3.10" salt-version: - - "3006.0" - - "3007.0" + - "3006.9" + - "3007.1" pytest-version: - "7.4.0" - "8.0.0" - - "8.1.0" - exclude: - - {"pytest-version": "8.0.0", "python-version": "3.7"} - - {"pytest-version": "8.1.0", "python-version": "3.7"} - - {"salt-version": "3007.0", "python-version": "3.7"} - - {"salt-version": "3007.0", "python-version": "3.8"} - - {"salt-version": "3007.0", "python-version": "3.9"} + - "8.1.1" + - "8.2.0" + - "8.3.3" steps: - uses: actions/checkout@v4 diff --git a/changelog/182.improvement.rst b/changelog/182.improvement.rst new file mode 100644 index 00000000..d43cf808 --- /dev/null +++ b/changelog/182.improvement.rst @@ -0,0 +1 @@ +Updated GitHub Actions for recent EOL of Python 3.7 and 3.8, using Salt 3006.9 and 3007.1, also use of psutil.AccessDenied diff --git a/requirements/base.txt b/requirements/base.txt index 42fe36eb..7847d24c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,11 +1,11 @@ -pytest>=7.0.0 -attrs>=19.2.0 -pytest-helpers-namespace>=2021.4.29 -pytest-skip-markers>=1.1.3 +pytest>=7.4.0 +attrs>=22.2.0 +pytest-helpers-namespace>=2021.12.29 +pytest-skip-markers>=1.5.2 pytest-system-statistics>=1.0.2 -pytest-shell-utilities>=1.4.0 -psutil -pyyaml -pyzmq -msgpack>=0.5.2 +pytest-shell-utilities<=1.9.0 +psutil<6.0.0 +pyyaml>=6.0.1 +pyzmq>=20.0.0 +msgpack>=1.0.2 virtualenv diff --git a/src/saltfactories/bases.py b/src/saltfactories/bases.py index 24a4e331..c37d385a 100644 --- a/src/saltfactories/bases.py +++ b/src/saltfactories/bases.py @@ -445,7 +445,7 @@ def _terminate(self): log.info("Stopping %s", self.factory) pid = self.pid # Collect any child processes information before terminating the process - with contextlib.suppress(psutil.NoSuchProcess): + with contextlib.suppress(psutil.NoSuchProcess, psutil.AccessDenied): for child in psutil.Process(pid).children(recursive=True): if child not in self._children: # pylint: disable=access-member-before-definition self._children.append(child) # pylint: disable=access-member-before-definition