summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2017-08-08 15:42:54 +0100
committerGitHub <noreply@github.com>2017-08-08 15:42:54 +0100
commit9ec2005d9f6540761a4525396aa1a593b09d419a (patch)
treec126eabb31b0d4d6926233a334cb4566d5b228cd
parent248f122970421af8ea73dce1dfc5b8cff2bd5e05 (diff)
parentf4ddf00c364e4396e7d941f91a8817311dd79adc (diff)
downloadpython-requests-9ec2005d9f6540761a4525396aa1a593b09d419a.tar.gz
Merge pull request #4223 from Lukasa/widen-idna-pin
Allow IDNA 2.6
-rw-r--r--HISTORY.rst4
-rwxr-xr-xsetup.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 1c107309..de6ba5c4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -10,6 +10,10 @@ dev
**Bugfixes**
+**Dependencies**
+
+- We now support idna v2.6.
+
2.18.3 (2017-08-02)
+++++++++++++++++++
diff --git a/setup.py b/setup.py
index 98702858..25887bb3 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ packages = ['requests']
requires = [
'chardet>=3.0.2,<3.1.0',
- 'idna>=2.5,<2.6',
+ 'idna>=2.5,<2.7',
'urllib3>=1.21.1,<1.23',
'certifi>=2017.4.17'