From 2ad18e0e10e7d7ecd5384c378f25ec8821a10a29 Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Wed, 3 May 2023 08:39:44 -0700 Subject: [PATCH] v2.30.0 --- HISTORY.md | 12 ++++++++++++ requests/__init__.py | 8 ++++---- requests/__version__.py | 4 ++-- setup.py | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 0b7b39ca1f..177ce59fe0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,18 @@ dev - \[Short description of non-trivial change.\] +2.30.0 (2023-05-03) +------------------- + +**Dependencies** +- ⚠️ Added support for urllib3 2.0. ⚠️ + + This may contain minor breaking changes so we advise careful testing and + reviewing https://urllib3.readthedocs.io/en/latest/v2-migration-guide.html + prior to upgrading. + + Users who wish to stay on urllib3 1.x can pin to `urllib3<2`. + 2.29.0 (2023-04-26) ------------------- diff --git a/requests/__init__.py b/requests/__init__.py index 22db3c1d7c..300a16c574 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -66,10 +66,10 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver # Check urllib3 for compatibility. major, minor, patch = urllib3_version # noqa: F811 major, minor, patch = int(major), int(minor), int(patch) - # urllib3 >= 1.21.1, <= 1.26 - assert major == 1 - assert minor >= 21 - assert minor <= 26 + # urllib3 >= 1.21.1 + assert major >= 1 + if major == 1: + assert minor >= 21 # Check charset_normalizer for compatibility. if chardet_version: diff --git a/requests/__version__.py b/requests/__version__.py index 4775ae32ed..e0f3373d0d 100644 --- a/requests/__version__.py +++ b/requests/__version__.py @@ -5,8 +5,8 @@ __title__ = "requests" __description__ = "Python HTTP for Humans." __url__ = "https://requests.readthedocs.io" -__version__ = "2.29.0" -__build__ = 0x022900 +__version__ = "2.30.0" +__build__ = 0x023000 __author__ = "Kenneth Reitz" __author_email__ = "me@kennethreitz.org" __license__ = "Apache 2.0" diff --git a/setup.py b/setup.py index bf13369be0..323e4f886d 100755 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def run_tests(self): requires = [ "charset_normalizer>=2,<4", "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", + "urllib3>=1.21.1,<3", "certifi>=2017.4.17", ] test_requirements = [