Merge branch 'master' into bump_pyright

Author: CoolCat467

.github/workflows/autodeps.yml

@@ -19,9 +19,9 @@ jobs:
       contents: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.8"
       - name: Bump dependencies

.github/workflows/ci.yml

@@ -18,18 +18,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # pypy 3.9 and 3.10 are failing, see https://github.com/python-trio/trio/issues/2678 and https://github.com/python-trio/trio/issues/2776 respectively
-        python: ['3.8', '3.9', '3.10'] #, 'pypy-3.9-nightly', 'pypy-3.10-nightly']
+        python: ['3.8', '3.9', '3.10']
         arch: ['x86', 'x64']
         lsp: ['']
         lsp_extract_file: ['']
         extra_name: ['']
-        exclude:
-          # pypy does not release 32-bit binaries
-          - python: 'pypy-3.9-nightly'
-            arch: 'x86'
-          #- python: 'pypy-3.10-nightly'
-          #  arch: 'x86'
         include:
           - python: '3.8'
             arch: 'x64'
@@ -57,9 +50,9 @@ jobs:
       }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        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.
@@ -94,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.9-nightly', 'pypy-3.10-nightly']
+        python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']
@@ -117,9 +110,9 @@ jobs:
       }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         if: "!endsWith(matrix.python, '-dev')"
         with:
           python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python), matrix.python))[startsWith(matrix.python, 'pypy')] }}
@@ -150,7 +143,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', 'pypy-3.9-nightly', 'pypy-3.10-nightly']
+        python: ['3.8', '3.9', '3.10']
     continue-on-error: >-
       ${{
         (
@@ -162,9 +155,9 @@ jobs:
       }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup python
-        uses: actions/setup-python@v4
+        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')] }}
           cache: pip
@@ -179,6 +172,65 @@ jobs:
           name: macOS (${{ matrix.python }})
           flags: macOS,${{ matrix.python }}
 
+  # run CI on a musl linux
+  Alpine:
+    name: "Alpine"
+    runs-on: ubuntu-latest
+    container: alpine
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install necessary packages
+        # can't use setup-python because that python doesn't seem to work;
+        # `python3-dev` (rather than `python:alpine`) for some ctypes reason,
+        # `nodejs` for pyright (`node-env` pulls in nodejs but that takes a while and can time out the test).
+        run: apk update && apk add python3-dev bash nodejs
+      - name: Enter virtual environment
+        run: python -m venv .venv
+      - name: Run tests
+        run: source .venv/bin/activate && ./ci.sh
+      - if: always()
+        uses: codecov/codecov-action@v3
+        with:
+          directory: empty
+          token: 87cefb17-c44b-4f2f-8b30-1fff5769ce46
+          name: Alpine
+          flags: Alpine,3.12
+
+  Cython:
+    name: "Cython"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ['3.8', '3.12']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+            python-version: '${{ matrix.python }}'
+            cache: pip
+        # setuptools is needed to get distutils on 3.12, which cythonize requires
+      - 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>=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'
+
   # https://github.com/marketplace/actions/alls-green#why
   check:  # This job does nothing and is only used for the branch protection
 
@@ -188,6 +240,8 @@ jobs:
       - Windows
       - Ubuntu
       - macOS
+      - Alpine
+      - Cython
 
     runs-on: ubuntu-latest
 

.pre-commit-config.yaml

@@ -19,11 +19,11 @@ repos:
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.1
+    rev: 24.2.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.2.2
     hooks:
       - id: ruff
         types: [file]

docs-requirements.in

@@ -9,7 +9,7 @@ towncrier
 
 # Trio's own dependencies
 cffi; os_name == "nt"
-attrs >= 19.2.0
+attrs >= 23.2.0
 sortedcontainers
 idna
 outcome

docs-requirements.txt

@@ -12,15 +12,15 @@ attrs==23.2.0
     #   outcome
 babel==2.14.0
     # via sphinx
-certifi==2023.11.17
+certifi==2024.2.2
     # via requests
 cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via towncrier
-cryptography==41.0.7
+cryptography==42.0.2
     # via pyopenssl
 docutils==0.20.1
     # via
@@ -42,12 +42,12 @@ importlib-resources==6.1.1
     # via towncrier
 incremental==22.10.0
     # via towncrier
-jinja2==3.1.2
+jinja2==3.1.3
     # via
     #   -r docs-requirements.in
     #   sphinx
     #   towncrier
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via jinja2
 outcome==1.3.0.post0
     # via -r docs-requirements.in
@@ -57,9 +57,9 @@ pycparser==2.21
     # via cffi
 pygments==2.17.2
     # via sphinx
-pyopenssl==23.3.0
+pyopenssl==24.0.0
     # via -r docs-requirements.in
-pytz==2023.3.post1
+pytz==2024.1
     # via babel
 requests==2.31.0
     # via sphinx
@@ -99,7 +99,7 @@ tomli==2.0.1
     # via towncrier
 towncrier==23.11.0
     # via -r docs-requirements.in
-urllib3==2.1.0
+urllib3==2.2.0
     # via requests
 zipp==3.17.0
     # via

docs/source/awesome-trio-libraries.rst

@@ -94,6 +94,7 @@ Testing
 * `hypothesis-trio <https://github.com/python-trio/hypothesis-trio>`__ - Hypothesis plugin for trio.
 * `trustme <https://github.com/python-trio/trustme>`__ - #1 quality TLS certs while you wait, for the discerning tester.
 * `pytest-aio <https://github.com/klen/pytest-aio>`_ - Pytest plugin with support for trio, curio, asyncio
+* `logot <https://github.com/etianen/logot>`_ - Test whether your async code is logging correctly.
 
 
 Tools and Utilities
@@ -106,6 +107,7 @@ Tools and Utilities
 * `perf-timer <https://github.com/belm0/perf-timer>`__ - A code timer with Trio async support (see ``TrioPerfTimer``).  Collects execution time of a block of code excluding time when the coroutine isn't scheduled, such as during blocking I/O and sleep.  Also offers ``trio_perf_counter()`` for low-level timing.
 * `aiometer <https://github.com/florimondmanca/aiometer>`__ - Execute lots of tasks concurrently while controlling concurrency limits
 * `triotp <https://linkdd.github.io/triotp>`__ - OTP framework for Python Trio
+* `aioresult <https://github.com/arthur-tacca/aioresult>`__ - Get the return value of a background async function in Trio or anyio, along with a simple Future class and wait utilities
 
 Trio/Asyncio Interoperability
 -----------------------------

docs/source/conf.py

@@ -223,7 +223,7 @@ def add_mapping(
 
 # General information about the project.
 project = "Trio"
-copyright = "2017, Nathaniel J. Smith"
+copyright = "2017, Nathaniel J. Smith"  # noqa: A001 # Name shadows builtin
 author = "Nathaniel J. Smith"
 
 # The version info for the project you're documenting, acts as replacement for

docs/source/history.rst

@@ -5,6 +5,24 @@ Release history
 
 .. towncrier release notes start
 
+Trio 0.24.0 (2024-01-10)
+------------------------
+
+Features
+~~~~~~~~
+
+- New helper classes: :class:`~.testing.RaisesGroup` and :class:`~.testing.Matcher`.
+
+  In preparation for changing the default of ``strict_exception_groups`` to `True`, we're introducing a set of helper classes that can be used in place of `pytest.raises <https://docs.pytest.org/en/stable/reference/reference.html#pytest.raises>`_ in tests, to check for an expected `ExceptionGroup`.
+  These are provisional, and only planned to be supplied until there's a good solution in ``pytest``. See https://github.com/pytest-dev/pytest/issues/11538 (`#2785 <https://github.com/python-trio/trio/issues/2785>`__)
+
+
+Deprecations and removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``MultiError`` has been fully removed, and all relevant trio functions now raise ExceptionGroups instead. This should not affect end users that have transitioned to using ``except*`` or catching ExceptionGroup/BaseExceptionGroup. (`#2891 <https://github.com/python-trio/trio/issues/2891>`__)
+
+
 Trio 0.23.2 (2023-12-14)
 ------------------------
 

docs/source/reference-core.rst

@@ -768,9 +768,14 @@ inside the handler function(s) with the ``nonlocal`` keyword::
         async with trio.open_nursery() as nursery:
             nursery.start_soon(broken1)
 
+.. _strict_exception_groups:
+
 "Strict" versus "loose" ExceptionGroup semantics
 ++++++++++++++++++++++++++++++++++++++++++++++++
 
+..
+    TODO: rewrite this (and possible other) sections from the new strict-by-default perspective, under the heading "Deprecated: non-strict ExceptionGroups" - to explain that it only exists for backwards-compatibility, will be removed in future, and that we recommend against it for all new code.
+
 Ideally, in some abstract sense we'd want everything that *can* raise an
 `ExceptionGroup` to *always* raise an `ExceptionGroup` (rather than, say, a single
 `ValueError`). Otherwise, it would be easy to accidentally write something like ``except
@@ -796,9 +801,10 @@ to set the default behavior for any nursery in your program that doesn't overrid
   wrapping, so you'll get maximum compatibility with code that was written to
   support older versions of Trio.
 
-To maintain backwards compatibility, the default is ``strict_exception_groups=False``.
-The default will eventually change to ``True`` in a future version of Trio, once
-Python 3.11 and later versions are in wide use.
+The default is set to ``strict_exception_groups=True``, in line with the default behaviour
+of ``TaskGroup`` in asyncio and anyio.  We've also found that non-strict mode makes it
+too easy to neglect the possibility of several exceptions being raised concurrently,
+causing nasty latent bugs when errors occur under load.
 
 .. _exceptiongroup: https://pypi.org/project/exceptiongroup/
 

docs/source/reference-testing.rst

@@ -72,6 +72,10 @@ Inter-task ordering
 
 .. autofunction:: wait_all_tasks_blocked
 
+.. autofunction:: wait_all_threads_completed
+
+.. autofunction:: active_thread_count
+
 
 .. _testing-streams:
 

docs/source/typevars.py

@@ -2,6 +2,7 @@
 
 See https://github.com/sphinx-doc/sphinx/issues/7722 also.
 """
+
 from __future__ import annotations
 
 import re

newsfragments/2785.feature.rst

@@ -0,0 +1,10 @@
+The :ref:`strict_exception_groups <strict_exception_groups>` parameter now defaults to `True` in `trio.run` and `trio.lowlevel.start_guest_run`. `trio.open_nursery` still defaults to the same value as was specified in `trio.run`/`trio.lowlevel.start_guest_run`, but if you didn't specify it there then all subsequent calls to `trio.open_nursery` will change.
+This is unfortunately very tricky to change with a deprecation period, as raising a `DeprecationWarning` whenever :ref:`strict_exception_groups <strict_exception_groups>` is not specified would raise a lot of unnecessary warnings.
+
+Notable side effects of changing code to run with ``strict_exception_groups==True``
+
+* If an iterator raises `StopAsyncIteration` or `StopIteration` inside a nursery, then python will not recognize wrapped instances of those for stopping iteration.
+* `trio.run_process` is now documented that it can raise an `ExceptionGroup`. It previously could do this in very rare circumstances, but with :ref:`strict_exception_groups <strict_exception_groups>` set to `True` it will now do so whenever exceptions occur in ``deliver_cancel`` or with problems communicating with the subprocess.
+
+  * Errors in opening the process is now done outside the internal nursery, so if code previously ran with ``strict_exception_groups=True`` there are cases now where an `ExceptionGroup` is *no longer* added.
+* `trio.TrioInternalError` ``.__cause__`` might be wrapped in one or more `ExceptionGroups <ExceptionGroup>`

newsfragments/2786.breaking.rst

@@ -0,0 +1 @@
+Add `trio.testing.wait_all_threads_completed`, which blocks until no threads are running tasks. This is intended to be used in the same way as `trio.testing.wait_all_tasks_blocked`.

newsfragments/2891.deprecated.rst

@@ -0,0 +1 @@
+The pthread functions are now correctly found on systems using vanilla versions of musl libc.

newsfragments/2937.feature.rst

@@ -29,16 +29,16 @@
 import errno
 import socket
 
-import attr
+import attrs
 
 
-@attr.s(repr=False)
+@attrs.define(repr=False, slots=False)
 class Options:
-    listen1_early = attr.ib(default=None)
-    listen1_middle = attr.ib(default=None)
-    listen1_late = attr.ib(default=None)
-    server = attr.ib(default=None)
-    listen2 = attr.ib(default=None)
+    listen1_early = None
+    listen1_middle = None
+    listen1_late = None
+    server = None
+    listen2 = None
 
     def set(self, which, sock):
         value = getattr(self, which)
@@ -47,7 +47,7 @@ def set(self, which, sock):
 
     def describe(self):
         info = []
-        for f in attr.fields(self.__class__):
+        for f in attrs.fields(self.__class__):
             value = getattr(self, f.name)
             if value is not None:
                 info.append(f"{f.name}={value}")