Skip to content

Commit 69db5c9

Browse files
hartworkkevin1024
authored andcommitted
Limit support for urllib3 >=2 to Python >=3.10 for now
.. because it turned out broken for Python <3.10.
1 parent 7c402ae commit 69db5c9

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

setup.py

+7
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ def run_tests(self):
4747
"wrapt",
4848
"six>=1.5",
4949
"yarl",
50+
# Support for urllib3 >=2 needs Python >=3.10
51+
# so we need to block urllib3 >=2 for Python <3.10 for now.
52+
# Note that vcrpy would work fine without any urllib3 around,
53+
# so this block and the dependency can be dropped at some point
54+
# in the future. For more Details:
55+
# https://github.com/kevin1024/vcrpy/pull/699#issuecomment-1551439663
56+
"urllib3 <2; python_version <'3.10'",
5057
]
5158

5259
tests_require = [

tox.ini

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ skip_missing_interpreters=true
33
envlist =
44
cov-clean,
55
lint,
6-
{py37,py38,py39,py310,py311}-{requests-urllib3-1,requests-urllib3-2,httplib2,urllib3-1,urllib3-2,tornado4,boto3,aiohttp,httpx},
7-
{pypy3}-{requests-urllib3-1,requests-urllib3-2,httplib2,urllib3-1,urllib3-2,tornado4,boto3},
6+
{py37,py38,py39,py310,py311}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3,aiohttp,httpx},
7+
{py310,py311}-{requests-urllib3-2,urllib3-2},
8+
{pypy3}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3},
89
{py310}-httpx019,
910
cov-report
1011

@@ -100,8 +101,8 @@ deps =
100101
httpx019: httpx==0.19
101102
{py37,py38,py39,py310}-{httpx}: pytest-asyncio
102103
depends =
103-
lint,{py37,py38,py39,py310,py311,pypy3}-{requests-urllib3-1,requests-urllib3-2,httplib2,urllib3-1,urllib3-2,tornado4,boto3},{py37,py38,py39,py310,py311}-{aiohttp},{py37,py38,py39,py310,py311}-{httpx}: cov-clean
104-
cov-report: lint,{py37,py38,py39,py310,py311,pypy3}-{requests-urllib3-1,requests-urllib3-2,httplib2,urllib3-1,urllib3-2,tornado4,boto3},{py37,py38,py39,py310,py311}-{aiohttp}
104+
lint,{py37,py38,py39,py310,py311,pypy3}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3},{py310,py311}-{requests-urllib3-2,urllib3-2},{py37,py38,py39,py310,py311}-{aiohttp},{py37,py38,py39,py310,py311}-{httpx}: cov-clean
105+
cov-report: lint,{py37,py38,py39,py310,py311,pypy3}-{requests-urllib3-1,httplib2,urllib3-1,tornado4,boto3},{py310,py311}-{requests-urllib3-2,urllib3-2},{py37,py38,py39,py310,py311}-{aiohttp}
105106
passenv =
106107
AWS_ACCESS_KEY_ID
107108
AWS_DEFAULT_REGION

0 commit comments

Comments
 (0)