Merge branch 'master' into static_check_mypy_and_class_members_and_fi…

…x_path

.github/workflows/autodeps.yml

@@ -40,7 +40,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           # https://stackoverflow.com/a/3879077/4504950
-          if ! git diff-index --quiet HEAD; then
+          if git diff-index --quiet HEAD; then
             echo "No changes to commit!"
             exit 0
           fi
@@ -49,6 +49,7 @@ jobs:
           git switch --force-create autodeps/bump_from_${GITHUB_SHA:0:6}
           git config user.name 'github-actions[bot]'
           git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git add .
           git commit -am "Dependency updates"
           git push --force --set-upstream origin autodeps/bump_from_${GITHUB_SHA:0:6}
 

test-requirements.in

@@ -16,7 +16,7 @@ mypy; implementation_name == "cpython"
 types-pyOpenSSL; implementation_name == "cpython"
 flake8
 astor          # code generation
-pip-tools
+pip-tools >= 6.13.0
 
 # https://github.com/python-trio/trio/pull/654#issuecomment-420518745
 # typed_ast is deprecated as of 3.8, and straight up doesn't compile on 3.10-dev as of 2021-12-13

test-requirements.txt

@@ -89,7 +89,7 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
-pip-tools==6.12.3
+pip-tools==6.13.0
     # via -r test-requirements.in
 platformdirs==3.2.0
     # via

trio/tests/test_dtls.py

@@ -3,7 +3,6 @@
 import trio.testing
 from trio import DTLSEndpoint
 import random
-import sys
 import attr
 from contextlib import asynccontextmanager
 from itertools import count
@@ -102,11 +101,12 @@ async def test_smoke(ipv6):
 
 @slow
 async def test_handshake_over_terrible_network(autojump_clock):
-    # PyPy is not fast enough
-    HANDSHAKES = 500 if sys.implementation.name == "pypy" else 1000
+    HANDSHAKES = 100
     r = random.Random(0)
     fn = FakeNet()
     fn.enable()
+    # avoid spurious timeouts on slow machines
+    autojump_clock.autojump_threshold = 0.001
 
     async with dtls_echo_server() as (_, address):
         async with trio.open_nursery() as nursery: