merge conflicts

lukegalbraithrussell · lukegalbraithrussell · commit 6acb82169e29 · 2025-08-01T16:43:59.000-07:00
diff --git a/requirements/testing_without_asyncio.txt b/requirements/testing_without_asyncio.txt
@@ -1,3 +1,3 @@
 # pip install -r requirements/testing_without_asyncio.txt
-pytest>=6.2.5,<8.4        # https://github.com/tornadoweb/tornado/issues/3375
+pytest>=6.2.5,<8.5        # https://github.com/tornadoweb/tornado/issues/3375
 pytest-cov>=3,<7
diff --git a/requirements/tools.txt b/requirements/tools.txt
@@ -1,3 +1,3 @@
-mypy==1.16.1
+mypy==1.17.1
 flake8==7.3.0
 black==24.8.0             # Until we drop Python 3.6 support, we have to stay with this version
