Merge branch 'main' into repl_ki

Author: A5rocks

.gitattributes

@@ -1,4 +1,4 @@
-# For files generated by trio/_tools/gen_exports.py
+# For files generated by trio/_tools/gen_exports.py or trio/_tools/windows_ffi_build.py
 trio/_core/_generated*    linguist-generated=true
 # Treat generated files as binary in git diff
 trio/_core/_generated*    -diff

.github/workflows/ci.yml

@@ -176,11 +176,17 @@ jobs:
             lsp: ''
             lsp_extract_file: ''
             extra_name: ''
+          - python: 'pypy-3.11'
+            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: ''
           #  extra_name: ', with non-IFS LSP'
+
     continue-on-error: >-
       ${{
         (
@@ -199,18 +205,11 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          # This allows the matrix to specify just the major.minor version while still
-          # expanding it to get the latest patch version including alpha releases.
-          # This avoids the need to update for each new alpha, beta, release candidate,
-          # and then finally an actual release version.  actions/setup-python doesn't
-          # support this for PyPy presently so we get no help there.
-          #
-          # 'CPython' -> '3.9.0-alpha - 3.9.X'
-          # 'PyPy'    -> 'pypy-3.9'
-          python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
+          python-version: '${{ matrix.python }}'
           architecture: '${{ matrix.arch }}'
           cache: pip
           cache-dependency-path: test-requirements.txt
+          allow-prereleases: true
       - name: Run tests
         run: ./ci.sh
         shell: bash
@@ -237,7 +236,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python: ['pypy-3.10', 'pypy-3.11', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']
@@ -273,13 +272,23 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
+          python-version: '${{ matrix.python }}'
           cache: pip
           cache-dependency-path: test-requirements.txt
+          allow-prereleases: true
+      - name: Check Formatting
+        if: matrix.check_formatting == '1'
+        run:
+          python -m pip install tox &&
+          tox -m check
+      - name: Install python3-apport
+        run: |
+          sudo apt update
+          sudo apt install -q python3-apport
       - name: Run tests
+        if: matrix.check_formatting == '0'
         run: ./ci.sh
         env:
-          CHECK_FORMATTING: '${{ matrix.check_formatting }}'
           NO_TEST_REQUIREMENTS: '${{ matrix.no_test_requirements }}'
       - if: >-
           always()
@@ -301,7 +310,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python: ['pypy-3.10', 'pypy-3.11', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     continue-on-error: >-
       ${{
         (
@@ -320,9 +329,10 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
+          python-version: '${{ matrix.python }}'
           cache: pip
           cache-dependency-path: test-requirements.txt
+          allow-prereleases: true
       - name: Run tests
         run: ./ci.sh
       - if: always()
@@ -348,19 +358,29 @@ jobs:
         # `nodejs` for pyright (`node-env` pulls in nodejs but that takes a while and can time out the test).
         # `perl` for a platform independent `sed -i` alternative
         run: apk update && apk add python3-dev bash nodejs perl
+
       - name: Retrieve the project source from an sdist inside the GHA artifact
         # must be after `apk add` because it relies on `bash` existing
         uses: re-actors/checkout-python-sdist@release/v2
         with:
           source-tarball-name: ${{ needs.build.outputs.sdist-artifact-name }}
           workflow-artifact-name: ${{ env.dists-artifact-name }}
+
       - name: Enter virtual environment
         run: python -m venv .venv
+
       - name: Run tests
         run: source .venv/bin/activate && ./ci.sh
+
       - name: Get Python version for codecov flag
         id: get-version
-        run: echo "version=$(python -V | cut -d' ' -f2 | cut -d'.' -f1,2)" >> "${GITHUB_OUTPUT}"
+        shell: python
+        run: |
+          import sys, os
+          with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+            f.write("version=" + ".".join(map(str, sys.version_info[:2])))
+            f.write("\n")
+
       - if: always()
         uses: codecov/codecov-action@v3
         with:
@@ -417,11 +437,19 @@ jobs:
       - name: import & run module
         run: coverage run -m tests.cython.run_test_cython
 
-      - name: get Python version for codecov flag
+      - name: Get Python version for codecov flag
         id: get-version
-        run: >-
-          echo "version=$(python -V | cut -d' ' -f2 | cut -d'.' -f1,2)"
-          >> "${GITHUB_OUTPUT}"
+        shell: python
+        run: |
+          import sys, os
+          with open(os.environ["GITHUB_OUTPUT"], "a") as f:
+            f.write("version=" + ".".join(map(str, sys.version_info[:2])))
+            f.write("\n")
+
+      - run: |
+          coverage combine
+          coverage report
+
       - if: always()
         uses: codecov/codecov-action@v5
         with:

.gitignore

@@ -1,3 +1,6 @@
+# generated by cythonize
+tests/cython/test_cython.c
+
 # In case somebody wants to restore the directory for local testing
 notes-to-self/
 

.pre-commit-config.yaml

@@ -24,9 +24,9 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.6
+    rev: v0.12.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         types: [file]
         types_or: [python, pyi, toml]
         args: ["--show-fixes"]
@@ -37,16 +37,16 @@ repos:
         additional_dependencies:
           # tomli needed on 3.10. tomllib is available in stdlib on 3.11+
           - tomli
-  - repo: https://github.com/crate-ci/typos
-    rev: typos-dict-v0.12.4
+  - repo: https://github.com/adhtruong/mirrors-typos
+    rev: v1.33.1
     hooks:
       - id: typos
   - repo: https://github.com/sphinx-contrib/sphinx-lint
     rev: v1.0.0
     hooks:
       - id: sphinx-lint
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.3.1
+    rev: v1.9.0
     hooks:
       - id: zizmor
   - repo: local
@@ -58,8 +58,22 @@ repos:
         pass_filenames: false
         additional_dependencies: ["astor", "attrs", "black", "ruff"]
         files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$
+      - id: regenerate-windows-cffi
+        name: regenerate windows CFFI
+        language: python
+        entry: python src/trio/_tools/windows_ffi_build.py
+        pass_filenames: false
+        additional_dependencies: ["cffi"]
+        files: ^src\/trio\/_tools\/windows_ffi_build\.py$
+      - id: sync-test-requirements
+        name: synchronize test requirements
+        language: python
+        entry: python src/trio/_tools/sync_requirements.py
+        pass_filenames: false
+        additional_dependencies: ["pyyaml"]
+        files: ^(test-requirements\.txt)|(\.pre-commit-config\.yaml)$
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.5.30
+    rev: 0.7.13
     hooks:
       # Compile requirements
       - id: pip-compile

README.rst

@@ -56,13 +56,13 @@ I/O-oriented programs easier, less error-prone, and just plain more
 fun. `Perhaps you'll find the same
 <https://github.com/python-trio/trio/wiki/Testimonials>`__.
 
-This project is young and still somewhat experimental: the overall
-design is solid, and the existing features are fully tested and
-documented, but you may encounter missing functionality or rough
-edges. We *do* encourage you to use it, but you should `read and
-subscribe to issue #1
-<https://github.com/python-trio/trio/issues/1>`__ to get a warning and a
-chance to give feedback about any compatibility-breaking changes.
+Trio is a mature and well-tested project: the overall design is solid,
+and the existing features are fully documented and widely used in
+production. While we occasionally make minor interface adjustments,
+breaking changes are rare. We encourage you to use Trio with confidence,
+but if you rely on long-term API stability, consider `subscribing to
+issue #1 <https://github.com/python-trio/trio/issues/1>`__ for advance
+notice of any compatibility updates.
 
 
 Where to next?