From c0ae7b1a4956210bc5ce619951663ec12ac4fac6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 18 Dec 2018 17:29:38 +0100
Subject: [PATCH] Upgrade requests to 2.21.0 (#19385)

---
 homeassistant/package_constraints.txt | 3 +--
 requirements_all.txt                  | 3 +--
 setup.py                              | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index d7a33b610a5..c9282920ae9 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -4,7 +4,6 @@ async_timeout==3.0.1
 attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
-idna==2.7
 jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
@@ -12,7 +11,7 @@ pip>=8.0.3
 python-slugify==1.2.6
 pytz>=2018.07
 pyyaml>=3.13,<4
-requests==2.20.1
+requests==2.21.0
 ruamel.yaml==0.15.81
 voluptuous==0.11.5
 voluptuous-serialize==2.0.0
diff --git a/requirements_all.txt b/requirements_all.txt
index bd41acd4c38..3f4c2ba927e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -5,7 +5,6 @@ async_timeout==3.0.1
 attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
-idna==2.7
 jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
@@ -13,7 +12,7 @@ pip>=8.0.3
 python-slugify==1.2.6
 pytz>=2018.07
 pyyaml>=3.13,<4
-requests==2.20.1
+requests==2.21.0
 ruamel.yaml==0.15.81
 voluptuous==0.11.5
 voluptuous-serialize==2.0.0
diff --git a/setup.py b/setup.py
index c5635987637..84a0f8811a1 100755
--- a/setup.py
+++ b/setup.py
@@ -38,8 +38,6 @@ REQUIRES = [
     'attrs==18.2.0',
     'bcrypt==3.1.4',
     'certifi>=2018.04.16',
-    # Dec 5, 2018: Idna released 2.8, requests caps idna at <2.8, CI fails
-    'idna==2.7',
     'jinja2>=2.10',
     'PyJWT==1.6.4',
     # PyJWT has loose dependency. We want the latest one.
@@ -48,7 +46,7 @@ REQUIRES = [
     'python-slugify==1.2.6',
     'pytz>=2018.07',
     'pyyaml>=3.13,<4',
-    'requests==2.20.1',
+    'requests==2.21.0',
     'ruamel.yaml==0.15.81',
     'voluptuous==0.11.5',
     'voluptuous-serialize==2.0.0',