From 1c42d19911172eb78bce39e1b2145de098e638d6 Mon Sep 17 00:00:00 2001 From: Alexander Alderman Webb Date: Mon, 22 Jun 2026 09:27:48 +0200 Subject: [PATCH 1/3] ci: Remove socksio from requirements-testing.txt --- requirements-testing.txt | 1 - scripts/populate_tox/tox.jinja | 1 + tox.ini | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-testing.txt b/requirements-testing.txt index a6041972cd..a1e054f7e6 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -11,7 +11,6 @@ executing asttokens responses pysocks -socksio httpcore[http2] setuptools Brotli diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 40426d30fb..7a5cf21fb9 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -81,6 +81,7 @@ deps = py3.8-common: hypothesis common: pytest-asyncio common: httpcore[asyncio] + common: socksio # See https://github.com/pytest-dev/pytest/issues/9621 # and https://github.com/pytest-dev/pytest-forked/issues/67 # for justification of the upper bound on pytest diff --git a/tox.ini b/tox.ini index e91115d32e..dd088a4d7c 100644 --- a/tox.ini +++ b/tox.ini @@ -404,6 +404,7 @@ deps = py3.8-common: hypothesis common: pytest-asyncio common: httpcore[asyncio] + common: socksio # See https://github.com/pytest-dev/pytest/issues/9621 # and https://github.com/pytest-dev/pytest-forked/issues/67 # for justification of the upper bound on pytest From 019bb66af00164f45e479558cc4d1fb162a5224e Mon Sep 17 00:00:00 2001 From: Alexander Alderman Webb Date: Mon, 22 Jun 2026 10:42:13 +0200 Subject: [PATCH 2/3] . --- scripts/populate_tox/tox.jinja | 1 + tox.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 7a5cf21fb9..6bf0b4b446 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -100,6 +100,7 @@ deps = {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest gevent: pytest-asyncio gevent: setuptools<82 + gevent: socksio {py3.10,py3.11}-gevent: zope.event<5.0.0 {py3.10,py3.11}-gevent: zope.interface<8.0 diff --git a/tox.ini b/tox.ini index dd088a4d7c..30fdfcf123 100644 --- a/tox.ini +++ b/tox.ini @@ -423,6 +423,7 @@ deps = {py3.8,py3.9,py3.10,py3.11,py3.12}-gevent: pytest gevent: pytest-asyncio gevent: setuptools<82 + gevent: socksio {py3.10,py3.11}-gevent: zope.event<5.0.0 {py3.10,py3.11}-gevent: zope.interface<8.0 From f7ea2883325850f1f59543d3ba2eb56b8f7a93b6 Mon Sep 17 00:00:00 2001 From: Alexander Alderman Webb Date: Tue, 23 Jun 2026 15:58:42 +0200 Subject: [PATCH 3/3] remove conflict markers --- requirements-testing.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/requirements-testing.txt b/requirements-testing.txt index 221005eee4..3cac3c91ba 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -7,11 +7,6 @@ jsonschema executing asttokens responses -<<<<<<< HEAD -pysocks -======= -socksio ->>>>>>> master httpcore[http2] setuptools docker