Updating CI/CD, and use Nodejs 20 (#47)

* Updating CI/CD, and use Nodejs 20

* Update some actions

* Re-adding support for psutil 6.0.0

* Updated the upload-artifact from v3 to v4

* Updated readthedocs requirements

* Stop making PDF build

Author: dmurphy18

.github/workflows/release.yml

@@ -8,11 +8,11 @@ jobs:
   Publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install Nox
@@ -27,4 +27,4 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.PYPI_TOKEN }}
-        print_hash: true
+        print-hash: true

.github/workflows/testing.yml

@@ -6,9 +6,9 @@ jobs:
   Pre-Commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Set Cache Key
@@ -17,7 +17,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y libxml2 libxml2-dev libxslt-dev
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ~/.cache/pre-commit
         key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
@@ -28,9 +28,9 @@ jobs:
     needs: Pre-Commit
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install Nox
@@ -49,10 +49,10 @@ jobs:
     timeout-minutes: 10
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python 3.9 For Nox
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -78,10 +78,10 @@ jobs:
     timeout-minutes: 10
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python 3.9 For Nox
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
 
@@ -120,10 +120,10 @@ jobs:
           - "8.0.0"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -168,7 +168,7 @@ jobs:
 
     - name: Upload Logs
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: runtests-${{ runner.os }}-Py${{ matrix.python-version}}-PyTest${{ matrix.pytest-version }}.log
         path: artifacts/runtests-*.log
@@ -193,10 +193,10 @@ jobs:
           - "8.0.0"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -245,7 +245,7 @@ jobs:
 
     - name: Upload Logs
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: runtests-${{ runner.os }}-Py${{ matrix.python-version}}-PyTest${{ matrix.pytest-version }}.log
         path: artifacts/runtests-*.log
@@ -270,10 +270,10 @@ jobs:
           - "8.0.0"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -318,7 +318,7 @@ jobs:
 
     - name: Upload Logs
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: runtests-${{ runner.os }}-Py${{ matrix.python-version}}-PyTest${{ matrix.pytest-version }}.log
         path: artifacts/runtests-*.log
@@ -334,11 +334,11 @@ jobs:
       - Windows
       - macOS
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install Nox
@@ -355,4 +355,4 @@ jobs:
         user: __token__
         password: ${{ secrets.TEST_PYPI_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
-        print_hash: true
+        print-hash: true

.pre-commit-config.yaml

@@ -1,8 +1,8 @@
 ---
-minimum_pre_commit_version: 2.9.2
+minimum_pre_commit_version: 3.6.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: trailing-whitespace
@@ -55,7 +55,7 @@ repos:
         exclude: ^src/pytestshellutils/(__init__|version)\.py$
 
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.12.0
+    rev: v3.13.0
     hooks:
       - id: reorder-python-imports
         args:
@@ -79,7 +79,7 @@ repos:
         additional_dependencies: [black==24.2.0]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.11.1
     hooks:
       - id: mypy
         alias: mypy-tools
@@ -93,7 +93,7 @@ repos:
           - types-requests
 
   - repo: https://github.com/s0undt3ch/python-tools-scripts
-    rev: "0.20.0"
+    rev: "0.20.5"
     hooks:
       - id: tools
         alias: actionlint
@@ -130,7 +130,7 @@ repos:
 
   # ----- Code Analysis --------------------------------------------------------------------------------------------->
   - repo: https://github.com/pycqa/flake8
-    rev: '7.0.0'
+    rev: '7.1.1'
     hooks:
       - id: flake8
         exclude: ^(src/pytestshellutils/version\.py|\.pre-commit-hooks/.*\.py)$
@@ -142,7 +142,7 @@ repos:
         - flake8-typing-imports
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.11.1
     hooks:
       - id: mypy
         files: ^((src|tests)/.*\.py)$

.readthedocs.yaml

@@ -7,21 +7,21 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.10"
     # You can also specify other tool versions:
-    # nodejs: "16"
-    # rust: "1.55"
-    # golang: "1.17"
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
    configuration: docs/conf.py
 
 # If using Sphinx, optionally build your docs in additional formats such as PDF
-formats:
-  - pdf
+## formats:
+##   - pdf
 
 # Optionally declare the Python requirements required to build your docs
 python:

changelog/47.improvement.rst

@@ -0,0 +1 @@
+Added support for psutil 6.0.0, connections becomes net_connections

requirements/docs.txt

@@ -1,6 +1,7 @@
 -r base.txt
 -r tests.txt
 -r changelog.txt
+towncrier <= 23.11.0
 furo
 sphinx
 sphinx-copybutton

src/pytestshellutils/shell.py

@@ -1278,9 +1278,9 @@ def _terminate_processes_matching_listen_ports(self) -> None:
         # If any processes were not terminated and are listening on the ports
         # we have set on listen_ports, terminate those processes.
         found_processes = []
-        for process in psutil.process_iter(["connections"]):
+        for process in psutil.process_iter(["net_connections"]):
             try:
-                for connection in process.connections():
+                for connection in process.net_connections():
                     if connection.status != psutil.CONN_LISTEN:
                         # We only care about listening services
                         continue
@@ -1289,7 +1289,7 @@ def _terminate_processes_matching_listen_ports(self) -> None:
                         # We already found one connection, no need to check the others
                         break
             except psutil.AccessDenied:  # pragma: no cover
-                # We've been denied access to this process connections. Carry on.
+                # We've been denied access to this process net_connections. Carry on.
                 continue
             except psutil.ZombieProcess:
                 continue