From 9149b6e7fc47743cdbcb5d3471a9650a2163b09b Mon Sep 17 00:00:00 2001
From: Andrey Rakhmatullin <wrar@wrar.name>
Date: Mon, 23 Jun 2025 20:42:11 +0500
Subject: [PATCH] Use new pytest for new Twisted. (#6893)

---
 tox.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5680d98d1..d3dc7a3db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,17 +14,17 @@ deps =
     pexpect >= 4.8.0
     pyftpdlib >= 2.0.1
     pygments
-    pytest != 8.2.*  # https://github.com/pytest-dev/pytest/issues/12275
+    pytest
     pytest-cov >= 4.0.0
     pytest-xdist
     sybil >= 1.3.0  # https://github.com/cjw296/sybil/issues/20#issuecomment-605433422
     testfixtures
     pywin32; sys_platform == "win32"
-    Twisted < 25.5.0  # https://github.com/twisted/twisted/issues/12467
 
 [testenv]
 deps =
     {[test-requirements]deps}
+    pytest >= 8.4.1  # https://github.com/pytest-dev/pytest/pull/13502
 
     # mitmproxy does not support PyPy
     mitmproxy; implementation_name != "pypy"
@@ -97,6 +97,8 @@ commands =
 [pinned]
 basepython = python3.9
 deps =
+    # pytest 8.4.1 adds support for Twisted 25.5.0 but drops support for Twisted < 24.10.0
+    pytest==8.4.0
     Protego==0.1.15
     Twisted==21.7.0
     cryptography==37.0.0
@@ -196,6 +198,7 @@ basepython = pypy3.10
 deps =
     PyPyDispatcher==2.1.0
     {[test-requirements]deps}
+    pytest==8.4.0
     Protego==0.1.15
     Twisted==21.7.0
     cryptography==41.0.5