Merge branch 'main' of github.com:python-trio/trio into dont-use-f_locals-for-agen-finalization

Author: graingert

.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,23 @@ 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']
         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: '3.9'
           #  arch: 'x64'
           #  lsp: 'http://download.pctools.com/mirror/updates/9.0.0.2308-SDavfree-lite_en.exe'
           #  lsp_extract_file: ''
@@ -87,16 +87,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 +143,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 +203,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 +224,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
 

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

@@ -3,7 +3,7 @@
 sphinx >= 6.0
 jinja2
 # >= is necessary to prevent `uv` from selecting a `Sphinx` version this does not support
-sphinx_rtd_theme >= 2
+sphinx_rtd_theme >= 3
 sphinxcontrib-jquery
 sphinxcontrib-trio
 towncrier

docs-requirements.txt

@@ -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==2.0.0
+sphinx-rtd-theme==3.0.0
     # via -r docs-requirements.in
 sphinxcontrib-applehelp==2.0.0
     # via sphinx

docs/source/conf.py

@@ -201,6 +201,13 @@ def setup(app: Sphinx) -> None:
     app.connect("source-read", on_read_source)
 
 
+# Our docs use the READTHEDOCS variable, so copied from:
+# https://about.readthedocs.com/blog/2024/07/addons-by-default/
+if os.environ.get("READTHEDOCS", "") == "True":
+    if "html_context" not in globals():
+        html_context = {}
+    html_context["READTHEDOCS"] = True
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -374,10 +381,7 @@ def add_mapping(
 # We have to set this ourselves, not only because it's useful for local
 # testing, but also because if we don't then RTD will throw away our
 # html_theme_options.
-import sphinx_rtd_theme
-
 html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

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