diff --git a/README.md b/README.md index 1ced50de9a..a6a39b0358 100644 --- a/README.md +++ b/README.md @@ -2366,7 +2366,7 @@ usage: -m [-h] [--tunnel-hostname TUNNEL_HOSTNAME] [--tunnel-port TUNNEL_PORT] [--filtered-client-ips FILTERED_CLIENT_IPS] [--filtered-url-regex-config FILTERED_URL_REGEX_CONFIG] -proxy.py v2.4.4rc6.dev3+gdbcff7af.d20240413 +proxy.py v2.4.4rc6.dev9+g11e37a62.d20240413 options: -h, --help show this help message and exit diff --git a/requirements-testing.txt b/requirements-testing.txt index b59dffb459..5ccf9bd99a 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -2,21 +2,28 @@ wheel==0.37.1 python-coveralls==2.9.3 coverage==6.2 flake8==4.0.1 -pytest==7.0.1 -pytest-cov==3.0.0 -pytest-xdist == 2.5.0 -pytest-mock==3.6.1 -pytest-asyncio==0.16.0 +# pytest for Python<3.11 +pytest==7.0.1; python_version < '3.11' +pytest-cov==3.0.0; python_version < '3.11' +pytest-xdist == 2.5.0; python_version < '3.11' +pytest-mock==3.6.1; python_version < '3.11' +pytest-asyncio==0.16.0; python_version < '3.11' +# pytest for Python>=3.11 +pytest==8.1.1; python_version >= '3.11' +pytest-cov==5.0.0; python_version >= '3.11' +pytest-xdist == 3.5.0; python_version >= '3.11' +pytest-mock==3.14.0; python_version >= '3.11' +pytest-asyncio==0.23.6; python_version >= '3.11' autopep8==1.6.0 mypy==0.971 py-spy==0.3.12 tox==3.28.0 mccabe==0.6.1 -pylint==2.13.7; python_version <= '3.10' +pylint==2.13.7; python_version < '3.11' pylint==3.1.0; python_version >= '3.11' rope==1.1.1 # Required by test_http2.py -httpx==0.22.0; python_version <= '3.10' +httpx==0.22.0; python_version < '3.11' httpx==0.27.0; python_version >= '3.11' h2==4.1.0 hpack==4.0.0 diff --git a/tox.ini b/tox.ini index 2a777f9cb5..5e7d706a4b 100644 --- a/tox.ini +++ b/tox.ini @@ -262,7 +262,6 @@ deps = pre-commit pylint >= 2.5.3 pylint-pytest < 1.1.0 - pytest-mock == 3.6.1 -r docs/requirements.in -r requirements-tunnel.txt -r requirements-testing.txt