Merge branch 'main' into pypy

Author: StanFromIreland

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: j178/prek-action@v1
+      - uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2

.github/workflows/main.yml

@@ -52,14 +52,16 @@ jobs:
             python: "3.14"
             experimental: false
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      with:
+        persist-credentials: false
     - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       if: "!endsWith(matrix.python, '-dev')"
       with:
         python-version: ${{ matrix.python }}
     - name: Set up Python ${{ matrix.python }} using deadsnakes
-      uses: deadsnakes/action@v3.2.0
+      uses: deadsnakes/action@e640ac8743173a67cca4d7d77cd837e514bf98e8 # v3.2.0
       if: "endsWith(matrix.python, '-dev')"
       with:
         python-version: ${{ matrix.python }}

.github/workflows/mypy.yml

@@ -14,8 +14,10 @@ jobs:
     name: Check code with mypy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           cache: "pip"
           cache-dependency-path: "pyproject.toml"

.github/workflows/publish.yml

@@ -15,13 +15,13 @@ jobs:
       id-token: write
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      with:
+        persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: '3.x'
-        cache: pip
-        cache-dependency-path: pyproject.toml
     - name: Install dependencies
       run: |
         python -m pip install --upgrade build
@@ -30,4 +30,4 @@ jobs:
         python -m build
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ^pyperformance/data-files/
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.1
+    rev: v0.15.11
     hooks:
       - id: ruff-check
         name: Run Ruff (lint)
@@ -10,12 +10,33 @@ repos:
         name: Run Ruff (format)
         args: [--exit-non-zero-on-fix]
 
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.37.1
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.12
+    hooks:
+      - id: actionlint
+
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.23.1
+    hooks:
+      - id: zizmor
+
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.6.0
+    rev: v2.21.1
     hooks:
       - id: pyproject-fmt
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24.1
+    rev: v0.25
     hooks:
       - id: validate-pyproject
+
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes

doc/benchmark.conf.sample

@@ -51,6 +51,9 @@ pgo = True
 #   PYTHON_JIT=0 can be used to disable the micro-op interpreter at runtime.
 jit = no
 
+# Tail-calling interpreter?
+tail_call_interp = False
+
 # The space-separated list of libraries that are package-only,
 # i.e., locally installed but not on header and library paths.
 # For each such library, determine the install path and add an

doc/benchmarks.rst

@@ -102,6 +102,22 @@ Available benchmarks:
 See the `base64 module <https://docs.python.org/dev/library/base64.html>`_.
 
 
+btree
+-----
+
+Benchmark a pure-Python implementation of a B-tree data structure.  The tree
+is created with a relatively large number of nodes (default is 200,000).  This
+attempts to simulate an application that operates on a large number of objects
+in memory (at least, large compared to other benchmarks currently in this
+suite). There are two variations of this benchmark: `btree` records the time to
+create the B-tree, run `gc.collect()` and then do some operations on it; the
+`btree_gc_only` variant records only the time to run `gc.collect()` and it
+skips the operations after creation.
+
+Note that this benchmark does not create any reference cycles that the garbage
+collector will need to break to free memory.
+
+
 chameleon
 ---------
 

pyperformance/compile.py

@@ -295,6 +295,8 @@ def compile(self):
             config_args.append("--with-lto")
         if self.conf.jit:
             config_args.append(f"--enable-experimental-jit={self.conf.jit}")
+        if self.conf.tail_call_interp:
+            config_args.append("--with-tail-call-interp")
         if self.conf.pkg_only:
             config_args.extend(self.get_package_only_flags())
         if self.conf.debug:
@@ -830,6 +832,7 @@ def getint(section, key, default=None):
         conf.lto = getboolean("compile", "lto", True)
         conf.pgo = getboolean("compile", "pgo", True)
         conf.jit = getstr("compile", "jit", "")
+        conf.tail_call_interp = getboolean("compile", "tail_call_interp", False)
         conf.install = getboolean("compile", "install", True)
         conf.pkg_only = getstr("compile", "pkg_only", "").split()
         try:

pyperformance/data-files/benchmarks/MANIFEST

@@ -26,6 +26,8 @@ asyncio_tcp_ssl	<local:asyncio_tcp>
 asyncio_websockets	<local>
 base64	<local>
 bpe_tokeniser	<local>
+btree	<local>
+btree_gc_only	<local:btree>
 concurrent_imap	<local>
 coroutines	<local>
 coverage	<local>

pyperformance/data-files/benchmarks/bm_btree/bm_btree.toml

@@ -0,0 +1,3 @@
+[tool.pyperformance]
+name = "btree_gc"
+extra_opts = ["all"]