From 54dfe045b211b6c65bac67be01217c8dcb323fdd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 May 2018 10:04:00 +0200
Subject: [PATCH] Upgrade aiohttp to 3.2.1 (#14517)

* Upgrade aiohttp to 3.2.1

* Upgrade async_timeout to 3.0.0

* Update the order of the requirements
---
 homeassistant/package_constraints.txt | 20 ++++++++++----------
 requirements_all.txt                  | 20 ++++++++++----------
 setup.py                              | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 4a7df44ee5e..e76dc24d9dd 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,15 +1,15 @@
-requests==2.18.4
-pyyaml>=3.11,<4
-pytz>=2018.04
-pip>=8.0.3
-jinja2>=2.10
-voluptuous==0.11.1
-typing>=3,<4
-aiohttp==3.1.3
-async_timeout==2.0.1
+aiohttp==3.2.1
 astral==1.6.1
-certifi>=2018.04.16
+async_timeout==3.0.0
 attrs==18.1.0
+certifi>=2018.04.16
+jinja2>=2.10
+pip>=8.0.3
+pytz>=2018.04
+pyyaml>=3.11,<4
+requests==2.18.4
+typing>=3,<4
+voluptuous==0.11.1
 
 # Breaks Python 3.6 and is not needed for our supported Python versions
 enum34==1000000000.0.0
diff --git a/requirements_all.txt b/requirements_all.txt
index 5d71464c08a..9bcf496df09 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1,16 +1,16 @@
 # Home Assistant core
-requests==2.18.4
-pyyaml>=3.11,<4
-pytz>=2018.04
-pip>=8.0.3
-jinja2>=2.10
-voluptuous==0.11.1
-typing>=3,<4
-aiohttp==3.1.3
-async_timeout==2.0.1
+aiohttp==3.2.1
 astral==1.6.1
-certifi>=2018.04.16
+async_timeout==3.0.0
 attrs==18.1.0
+certifi>=2018.04.16
+jinja2>=2.10
+pip>=8.0.3
+pytz>=2018.04
+pyyaml>=3.11,<4
+requests==2.18.4
+typing>=3,<4
+voluptuous==0.11.1
 
 # homeassistant.components.nuimo_controller
 --only-binary=all https://github.com/getSenic/nuimo-linux-python/archive/29fc42987f74d8090d0e2382e8f248ff5990b8c9.zip#nuimo==1.0.0
diff --git a/setup.py b/setup.py
index 2469f32d77e..4390b980f9e 100755
--- a/setup.py
+++ b/setup.py
@@ -42,18 +42,18 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, hass_const.__version__)
 PACKAGES = find_packages(exclude=['tests', 'tests.*'])
 
 REQUIRES = [
-    'requests==2.18.4',
-    'pyyaml>=3.11,<4',
-    'pytz>=2018.04',
-    'pip>=8.0.3',
-    'jinja2>=2.10',
-    'voluptuous==0.11.1',
-    'typing>=3,<4',
-    'aiohttp==3.1.3',
-    'async_timeout==2.0.1',
+    'aiohttp==3.2.1',
     'astral==1.6.1',
-    'certifi>=2018.04.16',
+    'async_timeout==3.0.0',
     'attrs==18.1.0',
+    'certifi>=2018.04.16',
+    'jinja2>=2.10',
+    'pip>=8.0.3',
+    'pytz>=2018.04',
+    'pyyaml>=3.11,<4',
+    'requests==2.18.4',
+    'typing>=3,<4',
+    'voluptuous==0.11.1',
 ]
 
 MIN_PY_VERSION = '.'.join(map(str, hass_const.REQUIRED_PYTHON_VER))
-- 
GitLab