Bump dependencies from commit 79218b (#3441)

* Dependency updates

* Add a rudimentary pin for Alpine

* Try 1 to fix CI

* Try 2 to fix CI

* Remove 3.12+ import

* Try 3 for CI

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Hopefully final fixes?

* Oops

* Oops

* Hopefully last change :/

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Oops

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: A5rocks <git@helvetica.moe>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

.github/workflows/ci.yml

@@ -357,7 +357,7 @@ jobs:
       - build
 
     runs-on: ubuntu-latest
-    container: alpine
+    container: alpine:3
     steps:
       - name: Install necessary packages
         # can't use setup-python because that python doesn't seem to work;

.pre-commit-config.yaml

@@ -20,11 +20,11 @@ repos:
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.3.1
+    rev: 26.5.0
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.12
+    rev: v0.15.13
     hooks:
       - id: ruff-check
         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/adhtruong/mirrors-typos
-    rev: v1.46.1
+    rev: v1.46.2
     hooks:
       - id: typos
   - repo: https://github.com/sphinx-contrib/sphinx-lint
     rev: v1.0.2
     hooks:
       - id: sphinx-lint
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.24.1
+    rev: v1.25.2
     hooks:
       - id: zizmor
   - repo: local
@@ -73,7 +73,7 @@ repos:
         additional_dependencies: ["pyyaml"]
         files: ^(test-requirements\.txt)|(\.pre-commit-config\.yaml)$
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.11.13
+    rev: 0.11.14
     hooks:
       # Compile requirements
       - id: pip-compile

docs-requirements.txt

@@ -18,21 +18,21 @@ cffi==2.0.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy'
     #   cryptography
 charset-normalizer==3.4.7
     # via requests
-click==8.3.3
+click==8.4.0
     # via towncrier
 colorama==0.4.6 ; sys_platform == 'win32'
     # via
     #   click
     #   sphinx
-cryptography==47.0.0
+cryptography==48.0.0
     # via pyopenssl
 docutils==0.22.4
     # via
     #   sphinx
     #   sphinx-rtd-theme
 exceptiongroup==1.3.1
     # via -r docs-requirements.in
-idna==3.13
+idna==3.15
     # via
     #   -r docs-requirements.in
     #   requests
@@ -55,9 +55,9 @@ pycparser==3.0 ; (implementation_name != 'PyPy' and os_name == 'nt') or (impleme
     # via cffi
 pygments==2.20.0
     # via sphinx
-pyopenssl==26.1.0
+pyopenssl==26.2.0
     # via -r docs-requirements.in
-requests==2.33.1
+requests==2.34.2
     # via sphinx
 roman-numerals==4.1.0
     # via sphinx
@@ -112,5 +112,5 @@ typing-extensions==4.15.0
     #   beautifulsoup4
     #   exceptiongroup
     #   pyopenssl
-urllib3==2.6.3
+urllib3==2.7.0
     # via requests

src/trio/_highlevel_generic.py

@@ -113,7 +113,7 @@ async def send_eof(self) -> None:
             return await stream.aclose()
 
     # we intentionally accept more types from the caller than we support returning
-    async def receive_some(self, max_bytes: int | None = None) -> bytes:
+    async def receive_some(self, max_bytes: int | None = None) -> bytes | bytearray:
         """Calls ``self.receive_stream.receive_some``."""
         return await self.receive_stream.receive_some(max_bytes)
 

src/trio/_tests/test_dtls.py

@@ -486,7 +486,7 @@ async def test_server_socket_doesnt_crash_on_garbage(
 
     async with dtls_echo_server(server_ctx=server_ctx) as (_, address):
         with trio.socket.socket(type=trio.socket.SOCK_DGRAM) as sock:
-            for bad_packet in [
+            bad_packets: list[bytes | bytearray | memoryview[int]] = [
                 b"",
                 b"xyz",
                 client_hello_extended,
@@ -497,7 +497,9 @@ async def test_server_socket_doesnt_crash_on_garbage(
                 client_hello_trailing_data_in_record,
                 handshake_empty,
                 client_hello_truncated_in_cookie,
-            ]:
+            ]
+
+            for bad_packet in bad_packets:
                 await sock.sendto(bad_packet, address)
                 await trio.sleep(1)
 
@@ -532,7 +534,7 @@ def route_packet(packet: UDPPacket) -> None:
                         offset = len(payload) - 1
                         cscope.cancel()
                     payload[offset] ^= 0x01
-                    packet = attrs.evolve(packet, payload=payload)
+                    packet = attrs.evolve(packet, payload=bytes(payload))
 
             fn.deliver_packet(packet)
 

src/trio/_tests/test_exports.py

@@ -417,18 +417,7 @@ def lookup_symbol(symbol: str) -> dict[str, Any]:  # type: ignore[misc, explicit
         # using .remove() instead of .delete() to get an error in case they start not
         # being missing
 
-        if (
-            tool == "jedi"
-            and BaseException in class_.__mro__
-            and sys.version_info >= (3, 11)
-        ):
-            missing.remove("add_note")
-
-        if (
-            tool == "mypy"
-            and BaseException in class_.__mro__
-            and sys.version_info >= (3, 11)
-        ):
+        if BaseException in class_.__mro__ and sys.version_info >= (3, 11):
             extra.remove("__notes__")
 
         if tool == "mypy" and attrs.has(class_):
@@ -443,8 +432,7 @@ def lookup_symbol(symbol: str) -> dict[str, Any]:  # type: ignore[misc, explicit
 
         # dir does not see `__signature__` on enums until 3.14
         if (
-            tool == "mypy"
-            and enum.Enum in class_.__mro__
+            enum.Enum in class_.__mro__
             and sys.version_info >= (3, 12)
             and sys.version_info < (3, 14)
         ):
@@ -508,16 +496,8 @@ def lookup_symbol(symbol: str) -> dict[str, Any]:  # type: ignore[misc, explicit
             if tool == "jedi" and sys.platform == "win32":
                 extra -= {"owner", "is_mount", "group"}
 
-        # not sure why jedi in particular ignores this (static?) method in 3.13
-        if (
-            tool == "jedi"
-            and sys.version_info[:2] == (3, 13)
-            and class_ in (trio.Path, trio.WindowsPath, trio.PosixPath)
-        ):
-            missing.remove("with_segments")
-
         # tuple subclasses are weird
-        if issubclass(class_, tuple):
+        if tool == "mypy" and issubclass(class_, tuple):
             extra.remove("__reversed__")
             missing.remove("__getnewargs__")
 
@@ -530,6 +510,22 @@ def lookup_symbol(symbol: str) -> dict[str, Any]:  # type: ignore[misc, explicit
             missing.discard("__annotate_func__")
             missing.discard("__annotations_cache__")
 
+        if tool == "jedi" and class_ == trio.open_memory_channel:
+            # something is seriously wrong with jedi's understanding of open_memory_channel...
+            for attrib in (
+                "__add__",
+                "__contains__",
+                "__getitem__",
+                "__getnewargs__",
+                "__iter__",
+                "__len__",
+                "__mul__",
+                "__rmul__",
+                "count",
+                "index",
+            ):
+                missing.remove(attrib)
+
         if missing or extra:  # pragma: no cover
             errors[f"{module_name}.{class_name}"] = {
                 "missing": missing,

src/trio/_tests/test_ssl.py

@@ -252,25 +252,26 @@ async def wait_send_all_might_not_block(self) -> None:
             await _core.checkpoint()
             await self.sleeper("wait_send_all_might_not_block")
 
-    async def send_all(self, data: bytes) -> None:
+    async def send_all(self, data: bytes | bytearray | memoryview[int]) -> None:
         print("  --> transport_stream.send_all")
+        data_ = bytes(data)
         with self._send_all_conflict_detector:
             await _core.checkpoint()
             await _core.checkpoint()
             await self.sleeper("send_all")
-            self._conn.bio_write(data)
+            self._conn.bio_write(data_)
             while True:
                 await self.sleeper("send_all")
                 try:
-                    data = self._conn.recv(1)
+                    data_ = self._conn.recv(1)
                 except SSL.ZeroReturnError:
                     self._conn.shutdown()
                     print("renegotiations:", self._conn.total_renegotiations())
                     break
                 except SSL.WantReadError:
                     break
                 else:
-                    self._pending_cleartext += data
+                    self._pending_cleartext += data_
             self._lot.unpark_all()
             await self.sleeper("send_all")
             print("  <-- transport_stream.send_all finished")

src/trio/_tests/test_testing.py

@@ -416,7 +416,7 @@ def close_hook() -> None:
 async def test_MemoryReceiveStream() -> None:
     mrs = MemoryReceiveStream()
 
-    async def do_receive_some(max_bytes: int | None) -> bytes:
+    async def do_receive_some(max_bytes: int | None) -> bytes | bytearray:
         with assert_checkpoints():
             return await mrs.receive_some(max_bytes)
 

src/trio/_unix_pipes.py

@@ -127,7 +127,7 @@ def __init__(self, fd: int) -> None:
             "another task is using this stream for receive",
         )
 
-    async def send_all(self, data: bytes) -> None:
+    async def send_all(self, data: bytes | bytearray | memoryview) -> None:
         with self._send_conflict_detector:
             # have to check up front, because send_all(b"") on a closed pipe
             # should raise

src/trio/_windows_pipes.py

@@ -52,7 +52,7 @@ def __init__(self, handle: int) -> None:
             "another task is currently using this pipe",
         )
 
-    async def send_all(self, data: bytes) -> None:
+    async def send_all(self, data: bytes | bytearray | memoryview[int]) -> None:
         with self._conflict_detector:
             if self._handle_holder.closed:
                 raise _core.ClosedResourceError("this pipe is already closed")
@@ -96,7 +96,7 @@ def __init__(self, handle: int) -> None:
             "another task is currently using this pipe",
         )
 
-    async def receive_some(self, max_bytes: int | None = None) -> bytes:
+    async def receive_some(self, max_bytes: int | None = None) -> bytes | bytearray:
         with self._conflict_detector:
             if self._handle_holder.closed:
                 raise _core.ClosedResourceError("this pipe is already closed")