Merge remote-tracking branch 'origin/main' into remove_notes_to_self

Author: jakkdl

.github/workflows/autodeps.yml

@@ -24,13 +24,13 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Bump dependencies
         run: |
           python -m pip install -U pip pre-commit
           python -m pip install -r test-requirements.txt
-          uv pip compile --universal --python-version=3.8 --upgrade test-requirements.in -o test-requirements.txt
+          uv pip compile --universal --python-version=3.9 --upgrade test-requirements.in -o test-requirements.txt
           uv pip compile --universal --python-version=3.11 --upgrade docs-requirements.in -o docs-requirements.txt
           pre-commit autoupdate --jobs 0
 
@@ -43,7 +43,7 @@ jobs:
 
       - name: uv
         run: |
-          uv pip compile --universal --python-version=3.8 test-requirements.in -o test-requirements.txt
+          uv pip compile --universal --python-version=3.9 test-requirements.in -o test-requirements.txt
           uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
 
       - name: Commit changes and create automerge PR

.github/workflows/ci.yml

@@ -18,23 +18,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
         arch: ['x86', 'x64']
         lsp: ['']
         lsp_extract_file: ['']
         extra_name: ['']
         include:
-          - python: '3.8'
+          - python: '3.9'
             arch: 'x64'
             lsp: 'https://raw.githubusercontent.com/python-trio/trio-ci-assets/master/komodia-based-vpn-setup.zip'
             lsp_extract_file: 'komodia-based-vpn-setup.exe'
             extra_name: ', with Komodia LSP'
-          - python: '3.8'
+          - python: '3.9'
             arch: 'x64'
             lsp: 'https://www.proxifier.com/download/legacy/ProxifierSetup342.exe'
             lsp_extract_file: ''
             extra_name: ', with IFS LSP'
-          #- python: '3.8'
+          - python: 'pypy-3.10'
+            arch: 'x64'
+            lsp: ''
+            lsp_extract_file: ''
+            extra_name: ''
+          #- python: '3.9'
           #  arch: 'x64'
           #  lsp: 'http://download.pctools.com/mirror/updates/9.0.0.2308-SDavfree-lite_en.exe'
           #  lsp_extract_file: ''
@@ -87,16 +92,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']
         include:
-          - python: '3.12'
+          - python: '3.13'
             check_formatting: '1'
             extra_name: ', check formatting'
           # separate test run that doesn't install test-requirements.txt
-          - python: '3.8'
+          - python: '3.9'
             no_test_requirements: '1'
             extra_name: ', no test-requirements'
     continue-on-error: >-
@@ -143,7 +148,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
     continue-on-error: >-
       ${{
         (
@@ -203,7 +208,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.12']
+        include:
+          - python: '3.9'  # We support running on cython 2 and 3 for 3.9
+            cython: '<3'   # cython 2
+          - python: '3.9'
+            cython: '>=3'  # cython 3 (or greater)
+          - python: '3.11' # 3.11 is the last version Cy2 supports
+            cython: '<3'   # cython 2
+          - python: '3.13' # We support running cython3 on 3.13
+            cython: '>=3'  # cython 3 (or greater)
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -216,18 +229,11 @@ jobs:
       - name: install trio and setuptools
         run: python -m pip install --upgrade pip . setuptools
 
-      - name: install cython<3
-        run: python -m pip install "cython<3"
-      - name: compile pyx file
-        run: cythonize -i tests/cython/test_cython.pyx
-      - name: import & run module
-        run: python -c 'import tests.cython.test_cython'
+      - name: install cython & compile pyx file
+        run: |
+          python -m pip install "cython${{ matrix.cython }}"
+          cythonize --inplace tests/cython/test_cython.pyx
 
-      - name: install cython>=3
-        run: python -m pip install "cython>=3"
-      - name: compile pyx file
-        # different cython version should trigger a re-compile, but --force just in case
-        run: cythonize --inplace --force tests/cython/test_cython.pyx
       - name: import & run module
         run: python -c 'import tests.cython.test_cython'
 

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
       - run: python -m pip install build
       - run: python -m build
 

.pre-commit-config.yaml

@@ -1,7 +1,5 @@
 ci:
-  autofix_commit_msg: "[pre-commit.ci] auto fixes from pre-commit.com hooks"
-  autofix_prs: false
-  autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
+  autofix_prs: true
   autoupdate_schedule: weekly
   submodules: false
   skip: [regenerate-files]
@@ -24,7 +22,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
+    rev: v0.8.0
     hooks:
       - id: ruff
         types: [file]

README.rst

@@ -92,7 +92,7 @@ demonstration of implementing the "Happy Eyeballs" algorithm in an
 older library versus Trio.
 
 **Cool, but will it work on my system?** Probably! As long as you have
-some kind of Python 3.8-or-better (CPython or `currently maintained versions of
+some kind of Python 3.9-or-better (CPython or `currently maintained versions of
 PyPy3 <https://doc.pypy.org/en/latest/faq.html#which-python-versions-does-pypy-implement>`__
 are both fine), and are using Linux, macOS, Windows, or FreeBSD, then Trio
 will work. Other environments might work too, but those

check.sh

@@ -78,7 +78,7 @@ fi
 
 # Check pip compile is consistent
 echo "::group::Pip Compile - Tests"
-uv pip compile --universal --python-version=3.8 test-requirements.in -o test-requirements.txt
+uv pip compile --universal --python-version=3.9 test-requirements.in -o test-requirements.txt
 echo "::endgroup::"
 echo "::group::Pip Compile - Docs"
 uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt

docs-requirements.txt

@@ -1,6 +1,6 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
-alabaster==0.7.16
+alabaster==1.0.0
     # via sphinx
 attrs==24.2.0
     # via
@@ -16,17 +16,17 @@ cffi==1.17.1 ; platform_python_implementation != 'PyPy' or os_name == 'nt'
     # via
     #   -r docs-requirements.in
     #   cryptography
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 click==8.1.7
     # via towncrier
 colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
     # via
     #   click
     #   sphinx
-cryptography==43.0.1
+cryptography==43.0.3
     # via pyopenssl
-docutils==0.20.1
+docutils==0.21.2
     # via
     #   sphinx
     #   sphinx-rtd-theme
@@ -38,14 +38,14 @@ idna==3.10
     #   requests
 imagesize==1.4.1
     # via sphinx
-immutables==0.20
+immutables==0.21
     # via -r docs-requirements.in
 jinja2==3.1.4
     # via
     #   -r docs-requirements.in
     #   sphinx
     #   towncrier
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via jinja2
 outcome==1.3.0.post0
     # via -r docs-requirements.in
@@ -67,7 +67,7 @@ sortedcontainers==2.4.0
     # via -r docs-requirements.in
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==7.4.7
+sphinx==8.1.3
     # via
     #   -r docs-requirements.in
     #   sphinx-codeautolink
@@ -79,7 +79,7 @@ sphinx-codeautolink==0.15.2
     # via -r docs-requirements.in
 sphinx-hoverxref==1.4.1
     # via -r docs-requirements.in
-sphinx-rtd-theme==3.0.0
+sphinx-rtd-theme==3.0.1
     # via -r docs-requirements.in
 sphinxcontrib-applehelp==2.0.0
     # via sphinx

docs/source/index.rst

@@ -45,7 +45,7 @@ Vital statistics:
 
 * Supported environments: We test on
 
-  - Python: 3.8+ (CPython and PyPy)
+  - Python: 3.9+ (CPython and PyPy)
   - Windows, macOS, Linux (glibc and musl), FreeBSD
 
   Other environments might also work; give it a try and see.

docs/source/reference-lowlevel.rst

@@ -377,6 +377,46 @@ These transitions are accomplished using two function decorators:
    poorly-timed :exc:`KeyboardInterrupt` could leave the lock in an
    inconsistent state and cause a deadlock.
 
+   Since KeyboardInterrupt protection is tracked per code object, any attempt to
+   conditionally protect the same block of code in different ways is unlikely to behave
+   how you expect. If you try to conditionally protect a closure, it will be
+   unconditionally protected instead::
+
+       def example(protect: bool) -> bool:
+           def inner() -> bool:
+               return trio.lowlevel.currently_ki_protected()
+           if protect:
+               inner = trio.lowlevel.enable_ki_protection(inner)
+           return inner()
+
+       async def amain():
+           assert example(False) == False
+           assert example(True) == True  # once protected ...
+           assert example(False) == True  # ... always protected
+
+       trio.run(amain)
+
+   If you really need conditional protection, you can achieve it by giving each
+   KI-protected instance of the closure its own code object::
+
+       def example(protect: bool) -> bool:
+           def inner() -> bool:
+               return trio.lowlevel.currently_ki_protected()
+           if protect:
+               inner.__code__ = inner.__code__.replace()
+               inner = trio.lowlevel.enable_ki_protection(inner)
+           return inner()
+
+       async def amain():
+           assert example(False) == False
+           assert example(True) == True
+           assert example(False) == False
+
+       trio.run(amain)
+
+   (This isn't done by default because it carries some memory overhead and reduces
+   the potential for specializing optimizations in recent versions of CPython.)
+
 .. autofunction:: currently_ki_protected
 
 

docs/source/tutorial.rst

@@ -88,7 +88,7 @@ Okay, ready? Let's get started.
 Before you begin
 ----------------
 
-1. Make sure you're using Python 3.8 or newer.
+1. Make sure you're using Python 3.9 or newer.
 
 2. ``python3 -m pip install --upgrade trio`` (or on Windows, maybe
    ``py -3 -m pip install --upgrade trio`` – `details