From fcc224fe78846a6329244b5a0a7bb1bbfb4b8bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= <adrian@chaves.io>
Date: Tue, 27 Sep 2022 09:03:58 +0200
Subject: [PATCH] tox.ini cleanup

---
 tox.ini | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/tox.ini b/tox.ini
index 81f82501c..bd7b5d714 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,16 +11,10 @@ minversion = 1.7.0
 deps =
     -rtests/requirements.txt
     # mitmproxy does not support PyPy
-    # mitmproxy does not support Windows when running Python < 3.7
-    # Python 3.9+ requires mitmproxy >= 5.3.0
     # mitmproxy >= 5.3.0 requires h2 >= 4.0, Twisted 21.2 requires h2 < 4.0
-    # mitmproxy < 7.0.0 is not compatible with pyOpenSSL >= 22.1.0
-    #mitmproxy >= 5.3.0; python_version >= '3.9' and implementation_name != 'pypy'
+    # mitmproxy < 7.0.0 is not compatible with pyOpenSSL >= 22.1.0, so no mitmproxy for Python ≤ 3.7
     # The tests hang with mitmproxy 8.0.0: https://github.com/scrapy/scrapy/issues/5454
-    mitmproxy >= 7.0.0, < 8; python_version >= '3.7' and python_version < '3.9' and implementation_name != 'pypy'
-    #mitmproxy >= 4.0.4, < 5; python_version >= '3.6' and python_version < '3.7' and platform_system != 'Windows' and implementation_name != 'pypy'
-    # newer markupsafe is incompatible with deps of old mitmproxy (which we get on Python 3.7 and lower)
-    markupsafe < 2.1.0; python_version >= '3.6' and python_version < '3.8' and implementation_name != 'pypy'
+    mitmproxy >= 7.0.0, < 8; python_version >= '3.8' and python_version < '3.9' and implementation_name != 'pypy'
     # Extras
     botocore>=1.4.87
 passenv =
@@ -59,8 +53,6 @@ commands =
 basepython = python3
 deps =
     {[testenv]deps}
-    # Twisted[http2] is required to import some files
-    Twisted[http2]>=17.9.0
     pytest-flake8
     flake8==3.9.2  # https://github.com/tholo/pytest-flake8/issues/81
 commands =
@@ -131,10 +123,6 @@ deps =
     reppy
     robotexclusionrulesparser
     Pillow>=4.0.0
-    Twisted[http2]>=17.9.0
-    # Twisted[http2] currently forces old mitmproxy because of h2 version restrictions in their deps,
-    # so we need to pin old markupsafe here too
-    markupsafe < 2.1.0
 
 [testenv:asyncio]
 commands =