Merge branch 'main' into maurycy-ruff-ci

* main:
  Remove fallbacks for unsupported Python versions (< 3.9) (psf#228)
  Docs: Update minimum Python version. Add matching badge (psf#226)

Author: maurycy

README.rst

@@ -6,6 +6,10 @@ pyperf
    :alt: Latest release on the Python Cheeseshop (PyPI)
    :target: https://pypi.python.org/pypi/pyperf
 
+.. image:: https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fpsf%2Fpyperf%2Frefs%2Fheads%2Fmain%2Fpyproject.toml
+   :alt: Supported Python versions
+   :target: https://pypi.python.org/pypi/pyperf
+
 .. image:: https://github.com/psf/pyperf/actions/workflows/build.yml/badge.svg
    :alt: Build status of pyperf on GitHub Actions
    :target: https://github.com/psf/pyperf/actions
@@ -128,7 +132,7 @@ Command to install pyperf on Python 3::
 
     python3 -m pip install pyperf
 
-pyperf requires Python 3.7 or newer.
+pyperf requires Python 3.9 or newer.
 
 Python 2.7 users can use pyperf 1.7.1 which is the last version compatible with
 Python 2.7.

doc/run_benchmark.rst

@@ -23,7 +23,7 @@ Optional dependencies:
 * Python module ``psutil``. Install: ``python3 -m pip install -U psutil``.
 * When you are using macOS, you need to install ``psutil`` if you want to use ``--track-memory`` option.
 
-pyperf requires Python 3.6 or newer.
+pyperf requires Python 3.9 or newer.
 
 Python 2.7 users can use pyperf 1.7.1 which is the last version compatible with
 Python 2.7.

doc/runner.rst

@@ -146,7 +146,7 @@ Option::
   There is no time out by default.
 * ``--tracemalloc``: Use the ``tracemalloc`` module to track Python memory
   allocation and get the peak of memory usage in metadata
-  (``tracemalloc_peak``). The module is only available on Python 3.4 and newer.
+  (``tracemalloc_peak``).
   See the `tracemalloc module
   <https://docs.python.org/dev/library/tracemalloc.html>`_.
 * ``--track-memory``: get the memory peak usage. it is less accurate than

pyperf/_cpu_utils.py

@@ -17,20 +17,10 @@ def get_logical_cpu_count():
     if psutil is not None:
         # Number of logical CPUs
         cpu_count = psutil.cpu_count()
-    elif hasattr(os, "cpu_count"):
+    else:
         # Python 3.4
+        # Python 3.13+: capped by -X cpu_count=n or $PYTHON_CPU_COUNT if set
         cpu_count = os.cpu_count()
-    else:
-        cpu_count = None
-        try:
-            import multiprocessing
-        except ImportError:
-            pass
-        else:
-            try:
-                cpu_count = multiprocessing.cpu_count()
-            except NotImplementedError:
-                pass
 
     if cpu_count is not None and cpu_count < 1:
         return None
@@ -148,7 +138,7 @@ def get_isolated_cpus():
 
 
 def set_cpu_affinity(cpus):
-    # Python 3.3 or newer?
+    # Availability: some Unix platforms
     if hasattr(os, "sched_setaffinity"):
         os.sched_setaffinity(0, cpus)
         return True
@@ -161,6 +151,8 @@ def set_cpu_affinity(cpus):
     except ImportError:
         return
 
+    # Availability: Linux, Windows, FreeBSD (psutil 2.2.0+)
+    # https://psutil.rtfd.io/en/latest/index.html#psutil.Process.cpu_affinity
     proc = psutil.Process()
     if not hasattr(proc, "cpu_affinity"):
         return

pyperf/_runner.py

@@ -527,14 +527,20 @@ def _cpu_affinity(self):
         else:
             if not isolated:
                 print("ERROR: CPU affinity not available.", file=sys.stderr)
-                print("Use Python 3.3 or newer, or install psutil dependency")
+                print(
+                    "Install psutil dependency and check "
+                    "psutil.Process.cpu_affinity is available on your OS."
+                )
                 sys.exit(1)
             elif not self.args.quiet:
                 print(
                     "WARNING: unable to pin worker processes to "
                     "isolated CPUs, CPU affinity not available"
                 )
-                print("Use Python 3.3 or newer, or install psutil dependency")
+                print(
+                    "Install psutil dependency and check "
+                    "psutil.Process.cpu_affinity is available on your OS."
+                )
 
     def _process_priority(self):
         if not MS_WINDOWS:

pyperf/_utils.py

@@ -200,22 +200,7 @@ def sysfs_path(path):
 
 
 def python_implementation():
-    if hasattr(sys, "implementation"):
-        # PEP 421, Python 3.3
-        name = sys.implementation.name
-    else:
-        # Code extracted from platform.python_implementation().
-        # Don't import platform to avoid the subprocess import.
-        sys_version = sys.version
-        if "IronPython" in sys_version:
-            name = "IronPython"
-        elif sys.platform.startswith("java"):
-            name = "Jython"
-        elif "PyPy" in sys_version:
-            name = "PyPy"
-        else:
-            name = "CPython"
-    return name.lower()
+    return sys.implementation.name.lower()
 
 
 def python_has_jit():

pyproject.toml

@@ -44,6 +44,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
+# Also update: README.rst, docs/run_benchmark.rst
 requires-python = ">=3.9"
 dependencies = ["psutil>=5.9.0"]