From 68923cfb9e5f7a9e87e156bb497ceec1703d3bc4 Mon Sep 17 00:00:00 2001
From: timrid <6593626+timrid@users.noreply.github.com>
Date: Mon, 8 Jun 2026 02:19:45 +0200
Subject: [PATCH 1/2] Optimize CI output for iOS/Android (#12814)

---
 .github/workflows/ci-cd.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index a3d6e373f9a..0e2de11a0a2 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -336,15 +336,29 @@ jobs:
     - name: Cythonize
       run: |
         make cythonize
+    - name: Enable KVM group perms for Android emulator
+      if: ${{ matrix.config.platform == 'android' }}
+      # This is normally done by cibuildwheel automatically, when it detects Github Actions. But by unsetting GITHUB_ACTIONS
+      # in the test step, we also disable that automatic setup. So we need to do it manually here.
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+    - name: Install cibuildwheel
+      run: uv pip install cibuildwheel==3.4.1
     - name: Build wheels and test
-      uses: pypa/cibuildwheel@v3.4.1
+      # cibuildwheel normally uses grouping in its outputs for its build/test steps. But the loading time when
+      # expanding large groups in GitHub Actions is very high. So by unsetting GITHUB_ACTIONS, cibuildwheel does
+      # not know that it is running in a GitHub Action and thus does not use groups.
+      run: env -u GITHUB_ACTIONS cibuildwheel
       env:
         CIBW_BUILD: ${{ matrix.pyver }}-*
         CIBW_PLATFORM: ${{ matrix.config.platform }}
         CIBW_ARCHS: ${{ matrix.config.archs }}
         CIBW_TEST_REQUIRES: -r requirements/test-mobile.txt
         CIBW_TEST_SOURCES: setup.cfg README.rst tests
-        CIBW_TEST_COMMAND: python -m pytest
+        # Currently only Android supports colored output. See https://github.com/python/cpython/issues/150932 for iOS.
+        CIBW_TEST_COMMAND: python -m pytest ${{ matrix.config.platform == 'android' && '--color=yes' || '' }}
 
   autobahn:
     permissions:

From 86c33baaa748bcb240a085e2d2e89cf2055a160a Mon Sep 17 00:00:00 2001
From: Wahaj Ahmed <wahaj.ahmed010@gmail.com>
Date: Mon, 8 Jun 2026 03:13:19 +0200
Subject: [PATCH 2/2] docs: remove stale response_factory param from add_static
 docs (#12797)

---
 docs/web_reference.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/web_reference.rst b/docs/web_reference.rst
index bfc2c29f865..68e9e279838 100644
--- a/docs/web_reference.rst
+++ b/docs/web_reference.rst
@@ -1880,7 +1880,6 @@ Application and Router
 
    .. method:: add_static(prefix, path, *, name=None, expect_handler=None, \
                           chunk_size=256*1024, \
-                          response_factory=StreamResponse, \
                           show_index=False, \
                           break_symlink_sandbox=False, \
                           append_version=False)