Skip to content

Commit 1e6169d

Browse files
authored
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 (#182)
* 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 * Added changelog and corrected ubuntu version * Reduced nox version limitation back to original less than 2022.8.7 * Updated requirements and actions * Adjust requirements versions * Limit to Python 3.10, since that is the only version supported at the moment * Altered requirments for pytest-shell-utilities to before psutil==6.0.0 * Updated pytest-shell-utilities version requirement * More playing with requirement versions * Limiting psutil to less than 6.0.0 to avoid net_connections issues * Restricting to pytest-shell-utilities before support for psutil 6.0.0 and net_connections * Remove macos and Salt 3007.1 testing, that is, as before Salt 3006 only
1 parent 8f2eaed commit 1e6169d

File tree

4 files changed

+27
-35
lines changed

4 files changed

+27
-35
lines changed

.github/workflows/testing.yml

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
105105
106106
Linux-System-Service:
107-
runs-on: ubuntu-20.04
107+
runs-on: ubuntu-22.04
108108
needs: Pre-Commit
109109

110110
timeout-minutes: 25
@@ -191,19 +191,16 @@ jobs:
191191
max-parallel: 16
192192
matrix:
193193
python-version:
194-
- "3.8"
195-
- "3.9"
196194
- "3.10"
197195
salt-version:
198-
- "3006.0"
199-
- "3007.0"
196+
- "3006.9"
197+
- "3007.1"
200198
pytest-version:
201199
- "7.4.0"
202200
- "8.0.0"
203-
- "8.1.0"
204-
exclude:
205-
- {"salt-version": "3007.0", "python-version": "3.8"}
206-
- {"salt-version": "3007.0", "python-version": "3.9"}
201+
- "8.1.1"
202+
- "8.2.0"
203+
- "8.3.3"
207204

208205
steps:
209206
- uses: actions/checkout@v4
@@ -282,14 +279,15 @@ jobs:
282279
max-parallel: 16
283280
matrix:
284281
python-version:
285-
- "3.9"
286282
- "3.10"
287283
salt-version:
288-
- "3006.0"
284+
- "3006.9"
289285
pytest-version:
290286
- "7.4.0"
291287
- "8.0.0"
292-
- "8.1.0"
288+
- "8.1.1"
289+
- "8.2.0"
290+
- "8.3.3"
293291

294292
steps:
295293
- uses: actions/checkout@v4
@@ -354,7 +352,7 @@ jobs:
354352

355353

356354
Linux:
357-
runs-on: ubuntu-20.04
355+
runs-on: ubuntu-22.04
358356
needs: Pre-Commit
359357

360358
timeout-minutes: 25
@@ -364,23 +362,16 @@ jobs:
364362
max-parallel: 16
365363
matrix:
366364
python-version:
367-
- "3.7"
368-
- "3.8"
369-
- "3.9"
370365
- "3.10"
371366
salt-version:
372-
- "3006.0"
373-
- "3007.0"
367+
- "3006.9"
368+
- "3007.1"
374369
pytest-version:
375370
- "7.4.0"
376371
- "8.0.0"
377-
- "8.1.0"
378-
exclude:
379-
- {"pytest-version": "8.0.0", "python-version": "3.7"}
380-
- {"pytest-version": "8.1.0", "python-version": "3.7"}
381-
- {"salt-version": "3007.0", "python-version": "3.7"}
382-
- {"salt-version": "3007.0", "python-version": "3.8"}
383-
- {"salt-version": "3007.0", "python-version": "3.9"}
372+
- "8.1.1"
373+
- "8.2.0"
374+
- "8.3.3"
384375

385376
steps:
386377
- uses: actions/checkout@v4

changelog/182.improvement.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

requirements/base.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
pytest>=7.0.0
2-
attrs>=19.2.0
3-
pytest-helpers-namespace>=2021.4.29
4-
pytest-skip-markers>=1.1.3
1+
pytest>=7.4.0
2+
attrs>=22.2.0
3+
pytest-helpers-namespace>=2021.12.29
4+
pytest-skip-markers>=1.5.2
55
pytest-system-statistics>=1.0.2
6-
pytest-shell-utilities>=1.4.0
7-
psutil
8-
pyyaml
9-
pyzmq
10-
msgpack>=0.5.2
6+
pytest-shell-utilities<=1.9.0
7+
psutil<6.0.0
8+
pyyaml>=6.0.1
9+
pyzmq>=20.0.0
10+
msgpack>=1.0.2
1111
virtualenv

src/saltfactories/bases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ def _terminate(self):
445445
log.info("Stopping %s", self.factory)
446446
pid = self.pid
447447
# Collect any child processes information before terminating the process
448-
with contextlib.suppress(psutil.NoSuchProcess):
448+
with contextlib.suppress(psutil.NoSuchProcess, psutil.AccessDenied):
449449
for child in psutil.Process(pid).children(recursive=True):
450450
if child not in self._children: # pylint: disable=access-member-before-definition
451451
self._children.append(child) # pylint: disable=access-member-before-definition

0 commit comments

Comments
 (0)