From 87a41017019b982e1cf7383883492bf5fa706a03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 May 2018 09:30:43 +0200 Subject: [PATCH 1/3] Upgrade aiohttp to 3.2.1 --- homeassistant/package_constraints.txt | 2 +- requirements_all.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 4a7df44ee5e60a..94986ae96a73a0 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -5,7 +5,7 @@ pip>=8.0.3 jinja2>=2.10 voluptuous==0.11.1 typing>=3,<4 -aiohttp==3.1.3 +aiohttp==3.2.1 async_timeout==2.0.1 astral==1.6.1 certifi>=2018.04.16 diff --git a/requirements_all.txt b/requirements_all.txt index 5d71464c08ae9a..823d452115189e 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -6,7 +6,7 @@ pip>=8.0.3 jinja2>=2.10 voluptuous==0.11.1 typing>=3,<4 -aiohttp==3.1.3 +aiohttp==3.2.1 async_timeout==2.0.1 astral==1.6.1 certifi>=2018.04.16 diff --git a/setup.py b/setup.py index 2469f32d77e683..b7395806e2b44b 100755 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ 'jinja2>=2.10', 'voluptuous==0.11.1', 'typing>=3,<4', - 'aiohttp==3.1.3', + 'aiohttp==3.2.1', 'async_timeout==2.0.1', 'astral==1.6.1', 'certifi>=2018.04.16', From dc21f4520a6fca44b377c975c8833169ad9be19c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 May 2018 09:31:17 +0200 Subject: [PATCH 2/3] Upgrade async_timeout to 3.0.0 --- homeassistant/package_constraints.txt | 2 +- requirements_all.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 94986ae96a73a0..5d950a9a14a276 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -6,7 +6,7 @@ jinja2>=2.10 voluptuous==0.11.1 typing>=3,<4 aiohttp==3.2.1 -async_timeout==2.0.1 +async_timeout==3.0.0 astral==1.6.1 certifi>=2018.04.16 attrs==18.1.0 diff --git a/requirements_all.txt b/requirements_all.txt index 823d452115189e..69e1e3cfa8007c 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -7,7 +7,7 @@ jinja2>=2.10 voluptuous==0.11.1 typing>=3,<4 aiohttp==3.2.1 -async_timeout==2.0.1 +async_timeout==3.0.0 astral==1.6.1 certifi>=2018.04.16 attrs==18.1.0 diff --git a/setup.py b/setup.py index b7395806e2b44b..355c83796def39 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ 'voluptuous==0.11.1', 'typing>=3,<4', 'aiohttp==3.2.1', - 'async_timeout==2.0.1', + 'async_timeout==3.0.0', 'astral==1.6.1', 'certifi>=2018.04.16', 'attrs==18.1.0', From 709a96afccedcaf1bda531ea07fd7cd941bc42d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 May 2018 09:31:58 +0200 Subject: [PATCH 3/3] Update the order of the requirements --- homeassistant/package_constraints.txt | 18 +++++++++--------- requirements_all.txt | 18 +++++++++--------- setup.py | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 5d950a9a14a276..e76dc24d9ddcb2 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.2.1 -async_timeout==3.0.0 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 69e1e3cfa8007c..9bcf496df09271 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.2.1 -async_timeout==3.0.0 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 355c83796def39..4390b980f9e948 100755 --- a/setup.py +++ b/setup.py @@ -42,18 +42,18 @@ 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.2.1', - 'async_timeout==3.0.0', '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))