Merge branch 'main' into pyrepl-new

Author: johnslavik

.github/CODEOWNERS

@@ -100,12 +100,12 @@ Lib/test/test_build_details.py          @FFY00
 InternalDocs/                 @AA-Turner
 
 # Tools, Configuration, etc
-Doc/Makefile                  @AA-Turner @hugovk
-Doc/_static/                  @AA-Turner @hugovk
-Doc/conf.py                   @AA-Turner @hugovk
-Doc/make.bat                  @AA-Turner @hugovk
-Doc/requirements.txt          @AA-Turner @hugovk
-Doc/tools/                    @AA-Turner @hugovk
+Doc/Makefile                  @AA-Turner @hugovk @StanFromIreland
+Doc/_static/                  @AA-Turner @hugovk @StanFromIreland
+Doc/conf.py                   @AA-Turner @hugovk @StanFromIreland
+Doc/make.bat                  @AA-Turner @hugovk @StanFromIreland
+Doc/requirements.txt          @AA-Turner @hugovk @StanFromIreland
+Doc/tools/                    @AA-Turner @hugovk @StanFromIreland
 
 # PR Previews
 .readthedocs.yml              @AA-Turner

.github/workflows/stale.yml

@@ -11,6 +11,7 @@ jobs:
     if: github.repository_owner == 'python'
     runs-on: ubuntu-latest
     permissions:
+      actions: write
       pull-requests: write
     timeout-minutes: 10
 

.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/

Android/README.md

@@ -103,14 +103,6 @@ require adding your user to a group, or changing your udev rules. On GitHub
 Actions, the test script will do this automatically using the commands shown
 [here](https://github.blog/changelog/2024-04-02-github-actions-hardware-accelerated-android-virtualization-now-available/).
 
-The test suite can usually be run on a device with 2 GB of RAM, but this is
-borderline, so you may need to increase it to 4 GB. As of Android
-Studio Koala, 2 GB is the default for all emulators, although the user interface
-may indicate otherwise. Locate the emulator's directory under `~/.android/avd`,
-and find `hw.ramSize` in both config.ini and hardware-qemu.ini. Either set these
-manually to the same value, or use the Android Studio Device Manager, which will
-update both files.
-
 You can run the test suite either:
 
 * Within the CPython repository, after doing a build as described above. On

Android/testbed/app/build.gradle.kts

@@ -20,6 +20,14 @@ val KNOWN_ABIS = mapOf(
     "x86_64-linux-android" to "x86_64",
 )
 
+val osArch = System.getProperty("os.arch")
+val NATIVE_ABI = mapOf(
+    "aarch64" to "arm64-v8a",
+    "amd64" to "x86_64",
+    "arm64" to "arm64-v8a",
+    "x86_64" to "x86_64",
+)[osArch] ?: throw GradleException("Unknown os.arch '$osArch'")
+
 // Discover prefixes.
 val prefixes = ArrayList<File>()
 if (inSourceTree) {
@@ -151,6 +159,9 @@ android {
     testOptions {
         managedDevices {
             localDevices {
+                // systemImageSource should use what its documentation calls an
+                // "explicit source", i.e. the sdkmanager package name format, because
+                // that will be required in CreateEmulatorTask below.
                 create("minVersion") {
                     device = "Small Phone"
 
@@ -159,13 +170,13 @@ android {
 
                     // ATD devices are smaller and faster, but have a minimum
                     // API level of 30.
-                    systemImageSource = if (apiLevel >= 30) "aosp-atd" else "aosp"
+                    systemImageSource = if (apiLevel >= 30) "aosp_atd" else "default"
                 }
 
                 create("maxVersion") {
                     device = "Small Phone"
                     apiLevel = defaultConfig.targetSdk!!
-                    systemImageSource = "aosp-atd"
+                    systemImageSource = "aosp_atd"
                 }
             }
 
@@ -191,6 +202,138 @@ dependencies {
 }
 
 
+afterEvaluate {
+    // Every new emulator has a maximum of 2 GB RAM, regardless of its hardware profile
+    // (https://cs.android.com/android-studio/platform/tools/base/+/refs/tags/studio-2025.3.2:sdklib/src/main/java/com/android/sdklib/internal/avd/EmulatedProperties.java;l=68).
+    // This is barely enough to test Python, and not enough to test Pandas
+    // (https://github.com/python/cpython/pull/137186#issuecomment-3136301023,
+    // https://github.com/pandas-dev/pandas/pull/63405#issuecomment-3667846159).
+    // So we'll increase it by editing the emulator configuration files.
+    //
+    // If the emulator doesn't exist yet, we want to edit it after it's created, but
+    // before it starts for the first time. Otherwise it'll need to be cold-booted
+    // again, which would slow down the first run, which is likely the only run in CI
+    // environments. But the Setup task both creates and starts the emulator if it
+    // doesn't already exist. So we create it ourselves before the Setup task runs.
+    for (device in android.testOptions.managedDevices.localDevices) {
+        val createTask = tasks.register<CreateEmulatorTask>("${device.name}Create") {
+            this.device = device.device
+            apiLevel = device.apiLevel
+            systemImageSource = device.systemImageSource
+            abi = NATIVE_ABI
+        }
+        tasks.named("${device.name}Setup") {
+            dependsOn(createTask)
+        }
+    }
+}
+
+abstract class CreateEmulatorTask : DefaultTask() {
+    @get:Input abstract val device: Property<String>
+    @get:Input abstract val apiLevel: Property<Int>
+    @get:Input abstract val systemImageSource: Property<String>
+    @get:Input abstract val abi: Property<String>
+    @get:Inject abstract val execOps: ExecOperations
+
+    private val avdName by lazy {
+        listOf(
+            "dev${apiLevel.get()}",
+            systemImageSource.get(),
+            abi.get(),
+            device.get().replace(' ', '_'),
+        ).joinToString("_")
+    }
+
+    private val avdDir by lazy {
+        // XDG_CONFIG_HOME is respected by both avdmanager and Gradle.
+        val userHome = System.getenv("ANDROID_USER_HOME") ?: (
+            (System.getenv("XDG_CONFIG_HOME") ?: System.getProperty("user.home")!!)
+            + "/.android"
+        )
+        File("$userHome/avd/gradle-managed", "$avdName.avd")
+    }
+
+    @TaskAction
+    fun run() {
+        if (!avdDir.exists()) {
+            createAvd()
+        }
+        updateAvd()
+    }
+
+    fun createAvd() {
+        val systemImage = listOf(
+            "system-images",
+            "android-${apiLevel.get()}",
+            systemImageSource.get(),
+            abi.get(),
+        ).joinToString(";")
+
+        runCmdlineTool("sdkmanager", systemImage)
+        runCmdlineTool(
+            "avdmanager", "create", "avd",
+            "--name", avdName,
+            "--path", avdDir,
+            "--device", device.get().lowercase().replace(" ", "_"),
+            "--package", systemImage,
+        )
+
+        val iniName = "$avdName.ini"
+        if (!File(avdDir.parentFile.parentFile, iniName).renameTo(
+            File(avdDir.parentFile, iniName)
+        )) {
+            throw GradleException("Failed to rename $iniName")
+        }
+    }
+
+    fun updateAvd() {
+        for (filename in listOf(
+            "config.ini",  // Created by avdmanager; always exists
+            "hardware-qemu.ini",  // Created on first run; might not exist
+        )) {
+            val iniFile = File(avdDir, filename)
+            if (!iniFile.exists()) {
+                if (filename == "config.ini") {
+                    throw GradleException("$iniFile does not exist")
+                }
+                continue
+            }
+
+            val iniText = iniFile.readText()
+            val pattern = Regex(
+                """^\s*hw.ramSize\s*=\s*(.+?)\s*$""", RegexOption.MULTILINE
+            )
+            val matches = pattern.findAll(iniText).toList()
+            if (matches.size != 1) {
+                throw GradleException(
+                    "Found ${matches.size} instances of $pattern in $iniFile; expected 1"
+                )
+            }
+
+            val expectedRam = "4096"
+            if (matches[0].groupValues[1] != expectedRam) {
+                iniFile.writeText(
+                    iniText.replace(pattern, "hw.ramSize = $expectedRam")
+                )
+            }
+        }
+    }
+
+    fun runCmdlineTool(tool: String, vararg args: Any) {
+        val androidHome = System.getenv("ANDROID_HOME")!!
+        val exeSuffix =
+            if (System.getProperty("os.name").lowercase().startsWith("win")) ".exe"
+            else ""
+        val command =
+            listOf("$androidHome/cmdline-tools/latest/bin/$tool$exeSuffix", *args)
+        println(command.joinToString(" "))
+        execOps.exec {
+            commandLine(command)
+        }
+    }
+}
+
+
 // Create some custom tasks to copy Python and its standard library from
 // elsewhere in the repository.
 androidComponents.onVariants { variant ->

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)