Merge branch 'main' into codecov_stuff

Author: jakkdl

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.2
+    rev: v0.8.3
     hooks:
       - id: ruff
         types: [file]

src/trio/_tests/test_highlevel_socket.py

@@ -20,6 +20,12 @@
     from collections.abc import Sequence
 
 
+@pytest.mark.xfail(
+    sys.platform == "darwin" and sys.version_info[:3] == (3, 13, 1),
+    reason="TODO: This started failing in CI after 3.13.1",
+    raises=OSError,
+    strict=True,
+)
 async def test_SocketStream_basics() -> None:
     # stdlib socket bad (even if connected)
     stdlib_a, stdlib_b = stdlib_socket.socketpair()

src/trio/_tests/test_socket.py

@@ -458,6 +458,12 @@ async def test_SocketType_basics() -> None:
     sock.close()
 
 
+@pytest.mark.xfail(
+    sys.platform == "darwin" and sys.version_info[:3] == (3, 13, 1),
+    reason="TODO: This started failing in CI after 3.13.1",
+    raises=OSError,
+    strict=True,
+)
 async def test_SocketType_setsockopt() -> None:
     sock = tsocket.socket()
     with sock as _: