[pull] master from giampaolo:master

.github/workflows/bsd.yml

@@ -11,57 +11,37 @@ concurrency:
   cancel-in-progress: true
 jobs:
   freebsd:
-    runs-on: ubuntu-22.04
+    # if: false
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/freebsd-vm@v1
         with:
           usesh: true
-          prepare: |
-            pkg install -y gcc python3
           run: |
-            set -e -x
-            make install-pip
-            python3 -m pip install --user setuptools
-            make install
-            make test
-            make test-memleaks
+            PIP_BREAK_SYSTEM_PACKAGES=1 make install-sysdeps install-pydeps-test install print-sysinfo test test-memleaks
+
   openbsd:
-    runs-on: ubuntu-22.04
+    # if: false
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/openbsd-vm@v1
         with:
           usesh: true
-          prepare: |
-            set -e
-            pkg_add gcc python3
           run: |
-            set -e
-            make install-pip
-            python3 -m pip install --user setuptools
-            make install
-            make test
-            make test-memleaks
+            PIP_BREAK_SYSTEM_PACKAGES=1 make install-sysdeps install-pydeps-test install print-sysinfo test test-memleaks
+
   netbsd:
-    runs-on: ubuntu-22.04
+    if: false  # XXX: disabled
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
         uses: vmactions/netbsd-vm@v1
         with:
           usesh: true
-          prepare: |
-            set -e
-            /usr/sbin/pkg_add -v pkgin
-            pkgin update
-            pkgin -y install python311-* py311-setuptools-* gcc12-*
           run: |
-            set -e
-            make install-pip PYTHON=python3.11
-            python3.11 -m pip install --user setuptools
-            make install PYTHON=python3.11
-            make test PYTHON=python3.11
-            make test-memleaks PYTHON=python3.11
+            PIP_BREAK_SYSTEM_PACKAGES=1 make PYTHON=python3.11 install-sysdeps install-pydeps-test install print-sysinfo test test-memleaks

.github/workflows/build.yml

@@ -1,8 +1,7 @@
 # Runs CI tests and generates wheels on the following platforms:
-#
-# * Linux (py2 and py3)
-# * macOS (py2 and py3)
-# * Windows (py3, py2 is done by appveyor)
+# * Linux
+# * macOS
+# * Windows
 #
 # Useful URLs:
 # * https://github.com/pypa/cibuildwheel
@@ -16,25 +15,23 @@ concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
   cancel-in-progress: true
 jobs:
-  # Linux + macOS + Windows Python 3
-  py3:
-    name: py3-${{ matrix.os }}-${{ startsWith(matrix.os, 'ubuntu') && 'all' || matrix.archs }}
+
+  # Run tests on Linux, macOS, Windows
+  tests:
+    name: "tests, ${{ matrix.os }}, ${{ matrix.arch }}"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
         include:
-        - os: ubuntu-latest
-          archs: "x86_64 i686"
-        - os: macos-12
-          archs: "x86_64"
-        - os: macos-14
-          archs: "arm64"
-        - os: windows-2019
-          archs: "AMD64"
-        - os: windows-2019
-          archs: "x86"
+        - {os: ubuntu-latest, arch: x86_64}
+        - {os: ubuntu-latest, arch: i686}
+        - {os: ubuntu-latest, arch: aarch64}
+        - {os: macos-13, arch: x86_64}
+        - {os: macos-14, arch: arm64}
+        - {os: windows-2019, arch: AMD64}
+        - {os: windows-2019, arch: x86}
     steps:
     - uses: actions/checkout@v4
 
@@ -51,16 +48,23 @@ jobs:
       with:
         python-version: 3.11
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      if: matrix.arch == 'aarch64'
+
     - name: Create wheels + run tests
-      uses: pypa/cibuildwheel@v2.18.0
+      uses: pypa/cibuildwheel@v2.22.0
       env:
-        CIBW_ARCHS: "${{ matrix.archs }}"
-        CIBW_PRERELEASE_PYTHONS: True
+        CIBW_ARCHS: "${{ matrix.arch }}"
+        CIBW_ENABLE: "cpython-prerelease"
+        CIBW_TEST_EXTRAS: test
+        CIBW_TEST_COMMAND:
+          make -C {project} PYTHON="env python" PSUTIL_SCRIPTS_DIR="{project}/scripts" install-sysdeps install-pydeps-test install print-sysinfo test test-memleaks
 
     - name: Upload wheels
       uses: actions/upload-artifact@v4
       with:
-        name: wheels-py3-${{ matrix.os }}-${{ startsWith(matrix.os, 'ubuntu') && 'all' || matrix.archs }}
+        name: wheels-${{ matrix.os }}-${{ matrix.arch }}
         path: wheelhouse
 
     - name: Generate .tar.gz
@@ -70,43 +74,19 @@ jobs:
         python setup.py sdist
         mv dist/psutil*.tar.gz wheelhouse/
 
-  # Linux + macOS + Python 2
-  py2:
-    name: py2-${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+  # Test python 2.7 fallback installation message produced by setup.py
+  py2-fallback:
+    name: py2.7 setup.py check
+    runs-on: ubuntu-24.04
     timeout-minutes: 20
     strategy:
       fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-12]
-    env:
-      CIBW_TEST_COMMAND:
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/runner.py &&
-        PYTHONWARNINGS=always PYTHONUNBUFFERED=1 PSUTIL_DEBUG=1 python {project}/psutil/tests/test_memleaks.py
-      CIBW_TEST_EXTRAS: test
-      CIBW_BUILD: 'cp27-*'
-
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+    - uses: LizardByte/setup-python-action@master
       with:
-        python-version: 3.9
-
-    - name: Create wheels + run tests
-      uses: pypa/cibuildwheel@v1.12.0
-
-    - name: Upload wheels
-      uses: actions/upload-artifact@v4
-      with:
-        name: wheels-py2-${{ matrix.os }}
-        path: wheelhouse
-
-    - name: Generate .tar.gz
-      if: matrix.os == 'ubuntu-latest'
-      run: |
-        make generate-manifest
-        python setup.py sdist
-        mv dist/psutil*.tar.gz wheelhouse/
+        python-version: '2.7'
+    - run: python scripts/internal/test_python2_setup_py.py
 
   # Run linters
   linters:
@@ -118,12 +98,12 @@ jobs:
         python-version: 3.x
     - name: 'Run linters'
       run: |
-        python3 -m pip install ruff==0.4.4 black rstcheck toml-sort sphinx
+        python3 -m pip install ruff black rstcheck toml-sort sphinx
         make lint-all
 
-  # upload weels as a single artefact
+  # Produce wheels as artifacts.
   upload-wheels:
-    needs: [py2, py3]
+    needs: [tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/upload-artifact/merge@v4

.github/workflows/issues.py

@@ -9,7 +9,6 @@
 on the situation.
 """
 
-from __future__ import print_function
 
 import functools
 import json
@@ -42,7 +41,7 @@
         "windows", "win32", "WinError", "WindowsError", "win10", "win7",
         "win ", "mingw", "msys", "studio", "microsoft", "make.bat",
         "CloseHandle", "GetLastError", "NtQuery", "DLL", "MSVC", "TCHAR",
-        "WCHAR", ".bat", "OpenProcess", "TerminateProcess", "appveyor",
+        "WCHAR", ".bat", "OpenProcess", "TerminateProcess",
         "windows error", "NtWow64", "NTSTATUS", "Visual Studio",
     ],
     "macos": [
@@ -62,6 +61,11 @@
         "/dev/pts", "posix",
     ],
     "pypy": ["pypy"],
+    "docker": ["docker", "docker-compose"],
+    "vm": [
+        "docker", "docker-compose", "vmware", "lxc", "hyperv", "virtualpc",
+        "virtualbox", "bhyve", "openvz", "lxc", "xen", "kvm", "qemu", "heroku",
+    ],
     # types
     "enhancement": ["enhancement"],
     "memleak": ["memory leak", "leaks memory", "memleak", "mem leak"],
@@ -84,14 +88,14 @@
     ],
     # tests
     "tests": [
-        " test ", "tests", "travis", "coverage", "cirrus", "appveyor",
+        " test ", "tests", "travis", "coverage", "cirrus",
         "continuous integration", "unittest", "pytest", "unit test",
     ],
     # critical errors
-    "priority-high": [
+    "critical": [
         "WinError", "WindowsError", "RuntimeError", "ZeroDivisionError",
-        "SystemError", "MemoryError", "core dumped",
-        "segfault", "segmentation fault",
+        "SystemError", "MemoryError", "core dump", "segfault",
+        "segmentation fault",
     ],
 }
 
@@ -144,11 +148,6 @@ def has_label(issue, label):
     return label in assigned
 
 
-def has_os_label(issue):
-    labels = set([x.name for x in issue.labels])
-    return any(x in labels for x in OS_LABELS)
-
-
 def get_repo():
     repo = os.environ['GITHUB_REPOSITORY']
     token = os.environ['GITHUB_TOKEN']
@@ -160,9 +159,10 @@ def get_repo():
 
 @functools.lru_cache()
 def _get_event_data():
-    ret = json.load(open(os.environ["GITHUB_EVENT_PATH"]))
-    pp(ret)
-    return ret
+    with open(os.environ["GITHUB_EVENT_PATH"]) as f:
+        ret = json.load(f)
+        pp(ret)
+        return ret
 
 
 def is_event_new_issue():
@@ -195,29 +195,29 @@ def get_issue():
 
 def log(msg):
     if '\n' in msg or "\r\n" in msg:
-        print(">>>\n%s\n<<<" % msg, flush=True)
+        print(f">>>\n{msg}\n<<<", flush=True)
     else:
-        print(">>> %s <<<" % msg, flush=True)
+        print(f">>> {msg} <<<", flush=True)
 
 
 def add_label(issue, label):
     def should_add(issue, label):
         if has_label(issue, label):
-            log("already has label %r" % (label))
+            log(f"already has label {label!r}")
             return False
 
         for left, right in ILLOGICAL_PAIRS:
             if label == left and has_label(issue, right):
-                log("already has label" % (label))
+                log(f"already has label f{label}")
                 return False
 
         return not has_label(issue, label)
 
     if not should_add(issue, label):
-        log("should not add label %r" % label)
+        log(f"should not add label {label!r}")
         return
 
-    log("add label %r" % label)
+    log(f"add label {label!r}")
     issue.add_to_labels(label)
 
 
@@ -330,16 +330,16 @@ def on_new_pr(issue):
 def main():
     issue = get_issue()
     stype = "PR" if is_pr(issue) else "issue"
-    log("running issue bot for %s %r" % (stype, issue))
+    log(f"running issue bot for {stype} {issue!r}")
 
     if is_event_new_issue():
-        log("created new issue %s" % issue)
+        log(f"created new issue {issue}")
         add_labels_from_text(issue, issue.title)
         if issue.body:
             add_labels_from_new_body(issue, issue.body)
         on_new_issue(issue)
     elif is_event_new_pr():
-        log("created new PR %s" % issue)
+        log(f"created new PR {issue}")
         add_labels_from_text(issue, issue.title)
         if issue.body:
             add_labels_from_new_body(issue, issue.body)

CREDITS

@@ -831,3 +831,12 @@ I: 2376
 N: Anthony Ryan
 W: https://github.com/anthonyryan1
 I: 2272
+
+N: Sam Gross
+W: https://github.com/colesbury
+I: 2401, 2427
+
+N: Aleksey Lobanov
+C: Russia
+E: alex_github@likemath.ru
+W: https://github.com/AlekseyLobanov