Merge branch 'main' into codecov-v4

Author: jakkdl

.git-blame-ignore-revs

@@ -1,2 +1,4 @@
 # sorting all imports with isort
 933f77b96f0092e1baab4474a9208fc2e379aa32
+# enabling ruff's flake8-commas rule
+b25c02a94e2defcb0fad32976b02218be1133bdf

.github/workflows/autodeps.yml

@@ -17,26 +17,35 @@ jobs:
       issues: write
       repository-projects: write
       contents: write
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup python
         uses: actions/setup-python@v5
         with:
           python-version: "3.8"
+
       - name: Bump dependencies
         run: |
           python -m pip install -U pip pre-commit
           python -m pip install -r test-requirements.txt
-          uv pip compile --no-strip-markers --python-version=3.8 --upgrade test-requirements.in -o test-requirements.txt
-          uv pip compile --no-strip-markers --python-version=3.8 --upgrade docs-requirements.in -o docs-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.11 --upgrade docs-requirements.in -o docs-requirements.txt
           pre-commit autoupdate --jobs 0
+
+      - name: Install new requirements
+        run: python -m pip install -r test-requirements.txt
+
+      # apply newer versions' formatting
       - name: Black
+        run: black src/trio
+
+      - name: uv
         run: |
-          # The new dependencies may contain a new black version.
-          # Commit any changes immediately.
-          python -m pip install -r test-requirements.txt
-          black src/trio
+          uv pip compile --universal --python-version=3.8 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
         env:
           GH_TOKEN: ${{ github.token }}

.github/workflows/check-newsfragment.yml

@@ -0,0 +1,23 @@
+name: Check newsfragment
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, synchronize]
+    branches:
+    - main
+
+jobs:
+  check-newsfragment:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip newsfragment') }}
+    runs-on: 'ubuntu-latest'
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check newsfragments
+        run: |
+          if git diff --name-only origin/main | grep -v '/_tests/' | grep 'src/trio/'; then
+            git diff --name-only origin/main | grep 'newsfragments/' || exit 1
+          fi

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
         arch: ['x86', 'x64']
         lsp: ['']
         lsp_extract_file: ['']
@@ -89,12 +89,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']
         include:
-          - python: '3.8'
+          - python: '3.12'
             check_formatting: '1'
             extra_name: ', check formatting'
           # separate test run that doesn't install test-requirements.txt
@@ -147,7 +147,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
     continue-on-error: >-
       ${{
         (

.github/workflows/release.yml

@@ -0,0 +1,44 @@
+on:
+  push:
+    tags:
+      - v*
+
+# a lot of code taken from https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+      - run: python -m pip install build
+      - run: python -m build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: trio-dist
+          path: |
+            dist/*.tar.gz
+            dist/*.whl
+
+  pypi-publish:
+    needs: [build]
+    name: upload release to PyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+      url: https://pypi.org/project/trio
+    permissions:
+      id-token: write
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: trio-*
+          path: dist
+          merge-multiple: true
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ ci:
   autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
   autoupdate_schedule: weekly
   submodules: false
+  skip: [regenerate-files]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -19,11 +20,11 @@ repos:
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.1
+    rev: v0.6.2
     hooks:
       - id: ruff
         types: [file]
@@ -33,3 +34,11 @@ repos:
     rev: v2.3.0
     hooks:
       - id: codespell
+  - repo: local
+    hooks:
+      - id: regenerate-files
+        name: regenerate generated files
+        language: system
+        entry: python src/trio/_tools/gen_exports.py
+        pass_filenames: false
+        files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$

check.sh

@@ -78,10 +78,10 @@ fi
 
 # Check pip compile is consistent
 echo "::group::Pip Compile - Tests"
-uv pip compile --no-strip-markers --python-version=3.8 test-requirements.in -o test-requirements.txt
+uv pip compile --universal --python-version=3.8 test-requirements.in -o test-requirements.txt
 echo "::endgroup::"
 echo "::group::Pip Compile - Docs"
-uv pip compile --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt
+uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
 echo "::endgroup::"
 
 if git status --porcelain | grep -q "requirements.txt"; then
@@ -112,7 +112,7 @@ if [ $EXIT_STATUS -ne 0 ]; then
 Problems were found by static analysis (listed above).
 To fix formatting and see remaining errors, run
 
-    pip install -r test-requirements.txt
+    uv pip install -r test-requirements.txt
     black src/trio
     ruff check src/trio
     ./check.sh

ci.sh

@@ -37,25 +37,29 @@ python -c "import sys, struct, ssl; print('python:', sys.version); print('versio
 echo "::endgroup::"
 
 echo "::group::Install dependencies"
-python -m pip install -U pip build
+python -m pip install -U pip uv -c test-requirements.txt
 python -m pip --version
+python -m uv --version
+
+python -m uv pip install build
 
 python -m build
-python -m pip install dist/*.whl
+wheel_package=$(ls dist/*.whl)
+python -m uv pip install "trio @ $wheel_package" -c test-requirements.txt
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
-    python -m pip install -r test-requirements.txt
+    python -m uv pip install -r test-requirements.txt exceptiongroup
     echo "::endgroup::"
     source check.sh
 else
     # Actual tests
     # expands to 0 != 1 if NO_TEST_REQUIREMENTS is not set, if set the `-0` has no effect
     # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
-    if [ ${NO_TEST_REQUIREMENTS-0} == 1 ]; then
-        python -m pip install pytest coverage
+    if [ "${NO_TEST_REQUIREMENTS-0}" == 1 ]; then
+        python -m uv pip install pytest coverage -c test-requirements.txt
         flags="--skip-optional-imports"
     else
-        python -m pip install -r test-requirements.txt
+        python -m uv pip install -r test-requirements.txt
         flags=""
     fi
 
@@ -118,7 +122,7 @@ else
     cd empty
 
     INSTALLDIR=$(python -c "import os, trio; print(os.path.dirname(trio.__file__))")
-    cp ../pyproject.toml $INSTALLDIR
+    cp ../pyproject.toml "$INSTALLDIR"
 
     # get mypy tests a nice cache
     MYPYPATH=".." mypy --config-file= --cache-dir=./.mypy_cache -c "import trio" >/dev/null 2>/dev/null || true
@@ -128,7 +132,7 @@ else
 
     echo "::endgroup::"
     echo "::group:: Run Tests"
-    if COVERAGE_PROCESS_START=$(pwd)/../pyproject.toml coverage run --rcfile=../pyproject.toml -m pytest -ra --junitxml=../test-results.xml --run-slow ${INSTALLDIR} --verbose --durations=10 $flags; then
+    if COVERAGE_PROCESS_START=$(pwd)/../pyproject.toml coverage run --rcfile=../pyproject.toml -m pytest -ra --junitxml=../test-results.xml --run-slow "${INSTALLDIR}" --verbose --durations=10 $flags; then
         PASSED=true
     else
         PASSED=false

docs-requirements.in

@@ -2,7 +2,8 @@
 # sphinx 5.3 doesn't work with our _NoValue workaround
 sphinx >= 6.0
 jinja2
-sphinx_rtd_theme
+# >= is necessary to prevent `uv` from selecting a `Sphinx` version this does not support
+sphinx_rtd_theme >= 2
 sphinxcontrib-jquery
 sphinxcontrib-trio
 towncrier

docs-requirements.txt

@@ -1,30 +1,36 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt
-alabaster==0.7.13
+#    uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
+alabaster==0.7.16
     # via sphinx
-attrs==23.2.0
+attrs==24.2.0
     # via
     #   -r docs-requirements.in
     #   outcome
-babel==2.15.0
+babel==2.16.0
     # via sphinx
 beautifulsoup4==4.12.3
     # via sphinx-codeautolink
 certifi==2024.7.4
     # via requests
-cffi==1.16.0 ; platform_python_implementation != 'PyPy'
-    # via cryptography
+cffi==1.17.0 ; platform_python_implementation != 'PyPy' or os_name == 'nt'
+    # via
+    #   -r docs-requirements.in
+    #   cryptography
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via towncrier
-cryptography==42.0.8
+colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+    # via
+    #   click
+    #   sphinx
+cryptography==43.0.0
     # via pyopenssl
 docutils==0.20.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
-exceptiongroup==1.2.1
+exceptiongroup==1.2.2
     # via -r docs-requirements.in
 idna==3.7
     # via
@@ -34,12 +40,6 @@ imagesize==1.4.1
     # via sphinx
 immutables==0.20
     # via -r docs-requirements.in
-importlib-metadata==8.0.0 ; python_version < '3.10'
-    # via sphinx
-importlib-resources==6.4.0 ; python_version < '3.10'
-    # via towncrier
-incremental==22.10.0
-    # via towncrier
 jinja2==3.1.4
     # via
     #   -r docs-requirements.in
@@ -51,14 +51,12 @@ outcome==1.3.0.post0
     # via -r docs-requirements.in
 packaging==24.1
     # via sphinx
-pycparser==2.22 ; platform_python_implementation != 'PyPy'
+pycparser==2.22 ; platform_python_implementation != 'PyPy' or os_name == 'nt'
     # via cffi
 pygments==2.18.0
     # via sphinx
-pyopenssl==24.1.0
+pyopenssl==24.2.1
     # via -r docs-requirements.in
-pytz==2024.1 ; python_version < '3.9'
-    # via babel
 requests==2.32.3
     # via sphinx
 sniffio==1.3.1
@@ -67,9 +65,9 @@ snowballstemmer==2.2.0
     # via sphinx
 sortedcontainers==2.4.0
     # via -r docs-requirements.in
-soupsieve==2.5
+soupsieve==2.6
     # via beautifulsoup4
-sphinx==7.1.2
+sphinx==7.4.7
     # via
     #   -r docs-requirements.in
     #   sphinx-codeautolink
@@ -83,11 +81,11 @@ sphinx-hoverxref==1.4.0
     # via -r docs-requirements.in
 sphinx-rtd-theme==2.0.0
     # via -r docs-requirements.in
-sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-applehelp==2.0.0
     # via sphinx
-sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-devhelp==2.0.0
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-htmlhelp==2.1.0
     # via sphinx
 sphinxcontrib-jquery==4.1
     # via
@@ -96,19 +94,13 @@ sphinxcontrib-jquery==4.1
     #   sphinx-rtd-theme
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-qthelp==2.0.0
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 sphinxcontrib-trio==1.1.2
     # via -r docs-requirements.in
-tomli==2.0.1 ; python_version < '3.11'
-    # via towncrier
-towncrier==23.11.0
+towncrier==24.7.1
     # via -r docs-requirements.in
 urllib3==2.2.2
     # via requests
-zipp==3.19.2 ; python_version < '3.10'
-    # via
-    #   importlib-metadata
-    #   importlib-resources