Merge branch 'main' into dependabot/pip/dot-github/workflows/pip-edd90ef302

Author: vstinner

.github/workflows/build.yml

@@ -8,21 +8,17 @@ env:
   FORCE_COLOR: 1
 
 jobs:
-  tox-jobs:
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-job: [doc, pep8]
+  doc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: 3.x
       - run: pip install tox
-      - run: tox -e ${{ matrix.tox-job }}
+      - run: tox -e doc
   build:
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - ${{ matrix.python }} ${{ matrix.build }}
@@ -33,36 +29,33 @@ jobs:
         build: ['']
         include:
           - os: ubuntu-latest
-            python: 'pypy3.10'
-          - os: ubuntu-latest
-            python: 'pypy3.9'
-          - os: ubuntu-latest
-            python: '3.9'
+            python: 'pypy3.11'
           - os: ubuntu-latest
             python: '3.10'
           - os: ubuntu-latest
             python: '3.11'
           - os: ubuntu-latest
             python: '3.12'
           - os: ubuntu-latest
-            python: '3.13-dev'
-            build: 'free-threading'
+            python: '3.13'
+          - os: ubuntu-latest
+            python: '3.14'
+          - os: ubuntu-latest
+            python: '3.14t'
+          - os: ubuntu-latest
+            python: '3.15'
+          - os: ubuntu-latest
+            python: '3.15t'
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Setup Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
-        if: ${{ matrix.build != 'free-threading' }}
-        with:
-          python-version: ${{ matrix.python }}
-      - name: Set up Python ${{ matrix.python }} using deadsnakes
-        uses: deadsnakes/action@e640ac8743173a67cca4d7d77cd837e514bf98e8 # v3.2.0
-        if: ${{ matrix.build == 'free-threading' }}
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: ${{ matrix.python }}
-          nogil: true
+          allow-prereleases: true
       - name: Display Python version
         run: |
           python -VV

.github/workflows/lint.yml

@@ -6,17 +6,14 @@ permissions: {}
 
 env:
   FORCE_COLOR: 1
+  RUFF_OUTPUT_FORMAT: github
 
 jobs:
   lint:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
-        with:
-          python-version: "3.x"
-      - uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
-      - uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4
+      - uses: j178/prek-action@5337cb91e0fa35a7ff31b9ca345126d8bbbcdf16 # v2.0.6

.github/workflows/publish.yml

@@ -18,11 +18,11 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
       with:
         python-version: '3.x'
     - name: Install dependencies
@@ -34,4 +34,4 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
+      uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1

.pre-commit-config.yaml

@@ -1,4 +1,10 @@
 repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.22
+    hooks:
+      - id: ruff-check
+        args: [--exit-non-zero-on-fix]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
@@ -14,7 +20,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.37.1
+    rev: 0.37.4
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
@@ -25,7 +31,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.24.1
+    rev: v1.29.0
     hooks:
       - id: zizmor
 

README.rst

@@ -4,11 +4,11 @@ pyperf
 
 .. image:: https://img.shields.io/pypi/v/pyperf.svg
    :alt: Latest release on the Python Cheeseshop (PyPI)
-   :target: https://pypi.python.org/pypi/pyperf
+   :target: https://pypi.org/project/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
+   :target: https://pypi.org/project/pyperf/
 
 .. image:: https://github.com/psf/pyperf/actions/workflows/build.yml/badge.svg
    :alt: Build status of pyperf on GitHub Actions
@@ -126,17 +126,12 @@ Quick Links
 * `pyperf project homepage at GitHub
   <https://github.com/psf/pyperf>`_ (code, bugs)
 * `Download latest pyperf release at the Python Cheeseshop (PyPI)
-  <https://pypi.python.org/pypi/pyperf>`_
+  <https://pypi.org/project/pyperf/>`_
 
-Command to install pyperf on Python 3::
+Install pyperf::
 
     python3 -m pip install pyperf
 
-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.
-
 pyperf is distributed under the MIT license.
 
 The pyperf project is covered by the `PSF Code of Conduct

doc/index.rst

@@ -46,11 +46,11 @@ Quick Links:
 * `pyperf project homepage at GitHub
   <https://github.com/psf/pyperf>`_ (code, bugs)
 * `Download latest pyperf release at the Python Cheeseshop (PyPI)
-  <https://pypi.python.org/pypi/pyperf>`_
+  <https://pypi.org/project/pyperf/>`_
 
 Other Python benchmark projects:
 
-* `pyperformance <https://pypi.python.org/pypi/pyperformance>`_: the Python
+* `pyperformance <https://pypi.org/project/pyperformance/>`_: the Python
   benchmark suite which uses ``pyperf``
 * `Python speed mailing list
   <https://mail.python.org/mailman/listinfo/speed>`_

doc/run_benchmark.rst

@@ -23,11 +23,6 @@ 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.9 or newer.
-
-Python 2.7 users can use pyperf 1.7.1 which is the last version compatible with
-Python 2.7.
-
 
 Run a benchmark
 ===============

pyperf/_hooks.py

@@ -18,10 +18,7 @@
 def get_hooks():
     hook_prefix = "pyperf.hook"
     entry_points = importlib.metadata.entry_points()
-    if sys.version_info[:2] < (3, 10):
-        group = entry_points[hook_prefix]
-    else:
-        group = entry_points.select(group=hook_prefix)
+    group = entry_points.select(group=hook_prefix)
     return group
 
 

pyproject.toml

@@ -51,8 +51,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
-# Also update: README.rst, docs/run_benchmark.rst
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = ["psutil>=5.9.0"]
 
 [project.optional-dependencies]
@@ -75,6 +74,9 @@ packages = ["pyperf", "pyperf.tests"]
 [tool.setuptools.dynamic]
 version = {attr = "pyperf.__version__"}
 
+[tool.ruff]
+fix = true
+
 [tool.ruff.lint]
 extend-select = ["C90", "UP"]
 extend-ignore = ["UP015", "UP031"]

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3, pypy3, doc, pep8
+envlist = py3, pypy3, doc
 isolated_build = True
 
 [testenv]
@@ -16,9 +16,3 @@ deps = sphinx
 allowlist_externals = make
 commands=
     make -C doc html
-
-[testenv:pep8]
-basepython = python3
-deps = ruff
-commands =
-    ruff check