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

Author: jakkdl

.github/workflows/ci.yml

@@ -427,6 +427,11 @@ jobs:
         run: >-
           echo "version=$(python -V | cut -d' ' -f2 | cut -d'.' -f1,2)"
           >> "${GITHUB_OUTPUT}"
+
+      - run: |
+          coverage combine
+          coverage report
+
       - if: always()
         uses: codecov/codecov-action@v5
         with:

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.4
     hooks:
       - id: ruff
         types: [file]
@@ -38,15 +38,15 @@ repos:
           # 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.6
+    rev: v1.31.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.4.1
+    rev: v1.5.2
     hooks:
       - id: zizmor
   - repo: local
@@ -59,7 +59,7 @@ repos:
         additional_dependencies: ["astor", "attrs", "black", "ruff"]
         files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.3
+    rev: 0.6.13
     hooks:
       # Compile requirements
       - id: pip-compile

docs-requirements.txt

@@ -2,7 +2,7 @@
 #    uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
 alabaster==1.0.0
     # via sphinx
-attrs==25.1.0
+attrs==25.3.0
     # via
     #   -r docs-requirements.in
     #   outcome
@@ -24,7 +24,7 @@ colorama==0.4.6 ; sys_platform == 'win32'
     # via
     #   click
     #   sphinx
-cryptography==44.0.1
+cryptography==44.0.2
     # via pyopenssl
 docutils==0.21.2
     # via
@@ -40,7 +40,7 @@ imagesize==1.4.1
     # via sphinx
 immutables==0.21
     # via -r docs-requirements.in
-jinja2==3.1.5
+jinja2==3.1.6
     # via
     #   -r docs-requirements.in
     #   sphinx
@@ -69,15 +69,15 @@ sortedcontainers==2.4.0
     # via -r docs-requirements.in
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==8.2.1
+sphinx==8.2.3
     # via
     #   -r docs-requirements.in
     #   sphinx-codeautolink
     #   sphinx-hoverxref
     #   sphinx-rtd-theme
     #   sphinxcontrib-jquery
     #   sphinxcontrib-trio
-sphinx-codeautolink==0.17.1
+sphinx-codeautolink==0.17.4
     # via -r docs-requirements.in
 sphinx-hoverxref==1.4.2
     # via -r docs-requirements.in
@@ -104,7 +104,7 @@ sphinxcontrib-trio==1.1.2
     # via -r docs-requirements.in
 towncrier==24.8.0
     # via -r docs-requirements.in
-typing-extensions==4.12.2
+typing-extensions==4.13.0
     # via
     #   beautifulsoup4
     #   pyopenssl

docs/source/_static/hackrtd.css renamed to docs/source/_static/styles.css

@@ -1,10 +1,3 @@
-/* Temporary hack to work around bug in rtd theme 2.0 through 2.4
-   See https://github.com/rtfd/sphinx_rtd_theme/pull/382
-*/
-pre {
-    line-height: normal !important;
-}
-
 /* Make .. deprecation:: blocks visible
  * (by default they're entirely unstyled)
  */
@@ -23,6 +16,10 @@ pre {
  * thingummy also has an <hr> in it, and putting the ornament on that looks
  * *really weird*. (In particular, the background color is wrong.)
  */
+.rst-content hr {
+    overflow: visible;
+}
+
 .rst-content hr:after {
     /* This .svg gets displayed on top of the middle of the hrule. It has a box
      * behind the logo that's colored to match the RTD theme body background
@@ -41,39 +38,21 @@ pre {
 
 /* Hacks to make the upper-left logo area look nicer */
 
-.wy-side-nav-search {
-    /* Lighter background color to match logo */
-    background-color: #d2e7fa !important;
-}
-
 .wy-side-nav-search > a {
     color: #306998 !important;
 }
 
-.wy-side-nav-search > a.logo {
-    display: block !important;
-    padding-bottom: 0.809em !important;
+/* vertically center version text */
+.wy-side-nav-search > a {
+    display: flex;
+    align-items: center;
+    margin: auto;
+    width: max-content;
 }
 
 .wy-side-nav-search > a img.logo {
-    display: inline !important;
-    padding: 0 !important;
-}
-
-.trio-version {
-    display: inline;
-    /* I *cannot* figure out how to get the version text vertically centered
-       on the logo. Oh well...
-    height: 32px;
-    line-height: 32px;
-    */
-}
-
-.wy-side-nav-search > a {
-    /* Mostly this is just to simplify things, so we don't have margin/padding
-     * on both the <a> and the <img> inside it */
-    margin: 0 !important;
-    padding: 0 !important;
+    margin-left: 0;
+    margin-right: 5px;
 }
 
 /* Get rid of the weird super dark "Contents" label that wastes vertical space

docs/source/_templates/layout.html

@@ -12,7 +12,7 @@
 <a class="logo" href="{{ pathto(root_doc) }}">
   <img class="logo" src="{{ logo_url }}" />
   {%- set nav_version = version %}
-  {% if READTHEDOCS and current_version %}
+  {% if current_version %}
     {%- set nav_version = current_version %}
   {% endif %}
   {# don't show the version on RTD if it's the default #}

docs/source/conf.py

@@ -26,6 +26,7 @@
 from typing import TYPE_CHECKING, cast
 
 from sphinx.util.inventory import _InventoryItem
+from sphinx.util.logging import getLogger
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
@@ -167,25 +168,55 @@ def autodoc_process_signature(
     return signature, return_annotation
 
 
-# XX hack the RTD theme until
-#   https://github.com/rtfd/sphinx_rtd_theme/pull/382
-# is shipped (should be in the release after 0.2.4)
-# ...note that this has since grown to contain a bunch of other CSS hacks too
-# though.
+# currently undocumented things
+logger = getLogger("trio")
+UNDOCUMENTED = {
+    "trio.MemorySendChannel",
+    "trio.MemoryReceiveChannel",
+    "trio.MemoryChannelStatistics",
+    "trio.SocketStream.aclose",
+    "trio.SocketStream.receive_some",
+    "trio.SocketStream.send_all",
+    "trio.SocketStream.send_eof",
+    "trio.SocketStream.wait_send_all_might_not_block",
+    "trio._subprocess.HasFileno.fileno",
+    "trio.lowlevel.ParkingLot.broken_by",
+}
+
+
+def autodoc_process_docstring(
+    app: Sphinx,
+    what: str,
+    name: str,
+    obj: object,
+    options: object,
+    lines: list[str],
+) -> None:
+    if not lines:
+        # TODO: document these and remove them from here
+        if name in UNDOCUMENTED:
+            return
+
+        logger.warning(f"{name} has no docstring")
+    else:
+        if name in UNDOCUMENTED:
+            logger.warning(
+                f"outdated list of undocumented things in docs/source/conf.py: {name!r} has a docstring"
+            )
+
+
 def setup(app: Sphinx) -> None:
-    app.add_css_file("hackrtd.css")
+    # Add our custom styling to make our documentation better!
+    app.add_css_file("styles.css")
     app.connect("autodoc-process-signature", autodoc_process_signature)
+    app.connect("autodoc-process-docstring", autodoc_process_docstring)
+
     # After Intersphinx runs, add additional mappings.
     app.connect("builder-inited", add_intersphinx, priority=1000)
     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
+html_context = {"current_version": os.environ.get("READTHEDOCS_VERSION_NAME")}
 
 # -- General configuration ------------------------------------------------
 
@@ -375,6 +406,7 @@ def add_mapping(
     "navigation_depth": 4,
     "logo_only": True,
     "prev_next_buttons_location": "both",
+    "style_nav_header_background": "#d2e7fa",
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,

newsfragments/2135.bugfix.rst

@@ -0,0 +1 @@
+Allow `trio` to be a `types.ModuleType` and still have deprecated attributes.

newsfragments/3133.bugfix.rst

@@ -0,0 +1,2 @@
+Fixed socket module for some older systems which lack ``socket.AI_NUMERICSERV``.
+Now trio works on legacy (pre-Lion) macOS.

newsfragments/3183.bugfix.rst

@@ -0,0 +1 @@
+Update type hints for `trio.run_process` and `trio.lowlevel.open_process`.

newsfragments/3205.bugfix.rst

@@ -0,0 +1 @@
+Don't mutate the global runner when MockClock is created.