From 35a725fa1e387814db5af40fec3f7b5e2ec2b317 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Thu, 17 Oct 2019 18:23:39 +0200 Subject: [PATCH] Update and pin all requirements (#759) --- requirements.txt | 23 +++++++++++------------ requirements_test.txt | 26 +++++++++++++------------- setup.py | 22 +++++++++++----------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/requirements.txt b/requirements.txt index 147c0cb2e..14ce06200 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,13 @@ voluptuous==0.11.7 -PyYAML>=5.1,<6 -paho-mqtt>=1.4,<2 -colorlog>=4.0.2 -tornado>=5.1.1,<6 +PyYAML==5.1.2 +paho-mqtt==1.4.0 +colorlog==4.0.2 +tornado==5.1.1 typing>=3.6.6;python_version<"3.5" -protobuf>=3.7,<3.8 -tzlocal>=1.5.1 -pytz>=2019.1 -pyserial>=3.4,<4 -ifaddr>=0.1.6,<1 -platformio>=3.6.5 ; python_version<"3" -https://github.com/platformio/platformio-core/archive/develop.zip ; python_version>"3" -esptool>=2.6,<3 +protobuf==3.10.0 +tzlocal==2.0.0 +pytz==2019.3 +pyserial==3.4 +ifaddr==0.1.6 +platformio==4.0.3 +esptool==2.7 diff --git a/requirements_test.txt b/requirements_test.txt index de09b1c76..26f14434d 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,17 +1,17 @@ voluptuous==0.11.7 -PyYAML>=5.1,<6 -paho-mqtt>=1.4,<2 -colorlog>=4.0.2 -tornado>=5.1.1,<6 -typing>=3.6.6 ; python_version<"3.5" -protobuf>=3.7,<3.8 -tzlocal>=1.5.1 -pytz>=2019.1 -pyserial>=3.4,<4 -ifaddr>=0.1.6,<1 -platformio>=3.6.7 ; python_version<"3" -https://github.com/platformio/platformio-core/archive/develop.zip ; python_version>"3" -esptool>=2.6,<3 +PyYAML==5.1.2 +paho-mqtt==1.4.0 +colorlog==4.0.2 +tornado==5.1.1 +typing>=3.6.6;python_version<"3.5" +protobuf==3.10.0 +tzlocal==2.0.0 +pytz==2019.3 +pyserial==3.4 +ifaddr==0.1.6 +platformio==4.0.3 +esptool==2.7 + pylint==1.9.4 ; python_version<"3" pylint==2.3.0 ; python_version>"3" flake8==3.6.0 diff --git a/setup.py b/setup.py index f2692f938..53acef5a3 100755 --- a/setup.py +++ b/setup.py @@ -24,16 +24,16 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__) REQUIRES = [ 'voluptuous==0.11.7', - 'PyYAML>=5.1,<6', - 'paho-mqtt>=1.4,<2', - 'colorlog>=4.0.2', - 'tornado>=5.1.1,<6', + 'PyYAML==5.1.2', + 'paho-mqtt==1.4.0', + 'colorlog==4.0.2', + 'tornado==5.1.1', 'typing>=3.6.6;python_version<"3.5"', - 'protobuf>=3.7,<3.8', - 'tzlocal>=1.5.1', - 'pytz>=2019.1', - 'pyserial>=3.4,<4', - 'ifaddr>=0.1.6,<1', + 'protobuf==3.10.0', + 'tzlocal==2.0.0', + 'pytz==2019.3', + 'pyserial==3.4', + 'ifaddr==0.1.6', ] # If you have problems importing platformio and esptool as modules you can set @@ -41,8 +41,8 @@ REQUIRES = [ # This means they have to be in your $PATH. if os.environ.get('ESPHOME_USE_SUBPROCESS') is None: REQUIRES.extend([ - 'platformio>=3.6.5', - 'esptool>=2.6,<3', + 'platformio==4.0.3', + 'esptool==2.7', ]) CLASSIFIERS = [