Skip to content

Commit 10ee604

Browse files
ci: Remove httpcore from requirements-testing.txt (#6622)
Remove the package from `requirements-testing.txt` and add it only as a dependency of the test suites that rely on it. Add `dataclasses` as a dependency for all tests, to avoid unhandled `ImportError` exceptions that arose after moving the `httpcore` dependency. This is part of environment cleanup before moving the remaining testing dependencies to a uv dependency group.
1 parent 036a297 commit 10ee604

4 files changed

Lines changed: 8 additions & 14 deletions

File tree

requirements-testing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
pytest>=6.0.0
22
pytest-cov
3+
dataclasses; python_version < "3.7"
34
pytest-forked
45
executing
56
asttokens
67
responses
7-
httpcore[http2]
88
setuptools
99
docker

scripts/populate_tox/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
"djangorestframework",
109109
"pytest-django",
110110
"Werkzeug",
111+
"channels[daphne]",
111112
],
112-
">=2.0": ["channels[daphne]"],
113113
">=2.2,<3.1": ["six"],
114114
">=3.0": ["pytest-asyncio"],
115115
"<3.3": [
@@ -433,7 +433,7 @@
433433
"deps": {
434434
"*": ["websockets<11.0", "aiohttp"],
435435
">=22": ["sanic-testing"],
436-
"py3.6": ["aiocontextvars==0.2.1", "dataclasses"],
436+
"py3.6": ["aiocontextvars==0.2.1"],
437437
"py3.8": ["tracerite<1.1.2"],
438438
},
439439
"num_versions": 4,

scripts/populate_tox/tox.jinja

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ deps =
8080
# === Common ===
8181
py3.8-common: hypothesis
8282
common: brotli
83+
common: httpcore[asyncio,http2]
8384
common: jsonschema
8485
common: pysocks
8586
common: pytest-asyncio
8687
common: pytest-timeout
8788
common: pytest_localserver
88-
common: httpcore[asyncio]
8989
common: socksio
9090
common: werkzeug
9191
# See https://github.com/pytest-dev/pytest/issues/9621
@@ -105,6 +105,7 @@ deps =
105105
{py3.6,py3.7}-gevent: pytest<7.0.0
106106
{py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest
107107
gevent: brotli
108+
gevent: httpcore[http2]
108109
gevent: jsonschema
109110
gevent: pysocks
110111
gevent: pytest-asyncio

tox.ini

Lines changed: 3 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)