summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate Prewitt <Nate.Prewitt@gmail.com>2019-05-15 08:20:29 -0700
committerNate Prewitt <Nate.Prewitt@gmail.com>2019-05-15 12:51:39 -0700
commitaeda65bbe57ac5edbcc2d80db85d010befb7d419 (patch)
tree0bb447ebbc087ac812875d2da38e93d81da3ba6f
parent68e581f1b5b4425a0ee950a2433fc3c92e671d0f (diff)
downloadpython-requests-urllib1.25.tar.gz
-rw-r--r--Pipfile.lock14
-rw-r--r--requests/__init__.py4
-rw-r--r--requests/__version__.py6
-rwxr-xr-xsetup.py2
4 files changed, 13 insertions, 13 deletions
diff --git a/Pipfile.lock b/Pipfile.lock
index 1f154e34..b50f4650 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -56,14 +56,14 @@
"socks"
],
"path": ".",
- "version": "==2.21.0"
+ "version": "==2.22.0"
},
"urllib3": {
"hashes": [
- "sha256:904bd981d6371bb95a200c0ec9dba5ba7cc980f2d6b125bd793fefe3293be388",
- "sha256:a9645efd62b9fc1c7cad8ed93e162aad4c6bfd90e143966ddd4099b78cd244be"
+ "sha256:a53063d8b9210a7bdec15e7b272776b9d42b2fd6816401a0d43006ad2f9902db",
+ "sha256:d363e3607d8de0c220d31950a8f38b18d5ba7c0830facd71a1c6b1036b7ce06c"
],
- "version": "==1.25.1"
+ "version": "==1.25.2"
},
"win-inet-pton": {
"hashes": [
@@ -708,10 +708,10 @@
},
"urllib3": {
"hashes": [
- "sha256:904bd981d6371bb95a200c0ec9dba5ba7cc980f2d6b125bd793fefe3293be388",
- "sha256:a9645efd62b9fc1c7cad8ed93e162aad4c6bfd90e143966ddd4099b78cd244be"
+ "sha256:a53063d8b9210a7bdec15e7b272776b9d42b2fd6816401a0d43006ad2f9902db",
+ "sha256:d363e3607d8de0c220d31950a8f38b18d5ba7c0830facd71a1c6b1036b7ce06c"
],
- "version": "==1.25.1"
+ "version": "==1.25.2"
},
"virtualenv": {
"hashes": [
diff --git a/requests/__init__.py b/requests/__init__.py
index bc168ee5..9a899df6 100644
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -57,10 +57,10 @@ def check_compatibility(urllib3_version, chardet_version):
# 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.24
+ # urllib3 >= 1.21.1, <= 1.25
assert major == 1
assert minor >= 21
- assert minor <= 24
+ assert minor <= 25
# Check chardet for compatibility.
major, minor, patch = chardet_version.split('.')[:3]
diff --git a/requests/__version__.py b/requests/__version__.py
index f5b5d036..9844f740 100644
--- a/requests/__version__.py
+++ b/requests/__version__.py
@@ -5,10 +5,10 @@
__title__ = 'requests'
__description__ = 'Python HTTP for Humans.'
__url__ = 'http://python-requests.org'
-__version__ = '2.21.0'
-__build__ = 0x022100
+__version__ = '2.22.0'
+__build__ = 0x022200
__author__ = 'Kenneth Reitz'
__author_email__ = 'me@kennethreitz.org'
__license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2018 Kenneth Reitz'
+__copyright__ = 'Copyright 2019 Kenneth Reitz'
__cake__ = u'\u2728 \U0001f370 \u2728'
diff --git a/setup.py b/setup.py
index 0b0a1ead..3dce2965 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ packages = ['requests']
requires = [
'chardet>=3.0.2,<3.1.0',
'idna>=2.5,<2.9',
- 'urllib3>=1.21.1,<1.25',
+ 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',
'certifi>=2017.4.17'
]