Merge branch 'main' into enable-error-overlays

Author: johnslavik

.github/workflows/reusable-san.yml

@@ -61,7 +61,7 @@ jobs:
               || ''
             }}.txt handle_segv=0" >> "$GITHUB_ENV"
         else
-          echo "UBSAN_OPTIONS=${SAN_LOG_OPTION}" >> "$GITHUB_ENV"
+          echo "UBSAN_OPTIONS=${SAN_LOG_OPTION} halt_on_error=1 suppressions=${GITHUB_WORKSPACE}/Tools/ubsan/suppressions.txt" >> "$GITHUB_ENV"
         fi
         echo "CC=clang" >> "$GITHUB_ENV"
         echo "CXX=clang++" >> "$GITHUB_ENV"
@@ -75,18 +75,21 @@ jobs:
         ${{
           inputs.sanitizer == 'TSan'
           && '--with-thread-sanitizer'
-          || '--with-undefined-behavior-sanitizer'
+          || '--with-undefined-behavior-sanitizer --with-strict-overflow'
         }}
         --with-pydebug
         ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
     - name: Build CPython
       run: make -j4
     - name: Display build info
       run: make pythoninfo
+    # test_{capi,faulthandler} are skipped under UBSan because
+    # they raise signals that UBSan with halt_on_error=1 intercepts.
     - name: Tests
       run: >-
         ./python -m test
         ${{ inputs.sanitizer == 'TSan' && '--tsan' || '' }}
+        ${{ inputs.sanitizer == 'UBSan' && '-x test_capi -x test_faulthandler' || '' }}
         -j4
     - name: Parallel tests
       if: >-

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: a27a2e47c7751b639d2b5badf0ef6ff11fee893f  # frozen: v0.15.4
+    rev: e05c5c0818279e5ac248ac9e954431ba58865e61  # frozen: v0.15.7
     hooks:
       - id: ruff-check
         name: Run Ruff (lint) on Platforms/Apple/

Doc/c-api/dict.rst

@@ -45,7 +45,7 @@ Dictionary objects
    The first argument can be a :class:`dict`, a :class:`frozendict`, or a
    mapping.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -76,7 +76,7 @@ Dictionary objects
 
    The first argument can be a :class:`dict` or a :class:`frozendict`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -90,7 +90,7 @@ Dictionary objects
 
    .. versionadded:: 3.13
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -142,7 +142,7 @@ Dictionary objects
 
    .. versionadded:: 3.13
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
    See also the :c:func:`PyObject_GetItem` function.
@@ -166,7 +166,7 @@ Dictionary objects
       Calling this API without an :term:`attached thread state` had been allowed for historical
       reason. It is no longer allowed.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -177,7 +177,7 @@ Dictionary objects
    occurred.  Return ``NULL`` **without** an exception set if the key
    wasn't present.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -195,7 +195,7 @@ Dictionary objects
       Prefer using the :c:func:`PyDict_GetItemWithError` function with your own
       :c:func:`PyUnicode_FromString` *key* instead.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -207,7 +207,7 @@ Dictionary objects
 
    .. versionadded:: 3.13
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -275,7 +275,7 @@ Dictionary objects
 
    The first argument can be a :class:`dict` or a :class:`frozendict`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -285,7 +285,7 @@ Dictionary objects
 
    The first argument can be a :class:`dict` or a :class:`frozendict`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -296,7 +296,7 @@ Dictionary objects
 
    The first argument can be a :class:`dict` or a :class:`frozendict`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -309,15 +309,15 @@ Dictionary objects
 
    The argument can be a :class:`dict` or a :class:`frozendict`.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
 .. c:function:: Py_ssize_t PyDict_GET_SIZE(PyObject *p)
 
    Similar to :c:func:`PyDict_Size`, but without error checking.
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 
@@ -391,7 +391,7 @@ Dictionary objects
       :term:`strong reference <strong reference>` (for example, using
       :c:func:`Py_NewRef`).
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
       Also accept :class:`frozendict`.
 
 .. c:function:: int PyDict_Merge(PyObject *a, PyObject *b, int override)