From ab6d293d0dbc17266c02a2b27155092b13f32531 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 27 Sep 2018 01:14:51 +0900
Subject: [PATCH] Fix docker installs using old platformio version (#125)

* Fix min platformio version and update requirements

* Remove unnecessary requirements from travis
---
 .travis.yml            |  2 +-
 Dockerfile             |  6 +-----
 docker/Dockerfile.lint |  2 +-
 requirements.txt       | 14 +++++++-------
 setup.py               |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 426bb9a6e..13b4d3cdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - "2.7"
 install:
   - pip install -r requirements.txt
-  - pip install tornado esptool flake8==3.5.0 pylint==1.8.4 tzlocal pillow
+  - pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow
 script:
  - flake8 esphomeyaml
  - pylint esphomeyaml
diff --git a/Dockerfile b/Dockerfile
index 7aa0a9776..8bbc456e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,17 +10,13 @@ EXPOSE 6123
 VOLUME /config
 WORKDIR /usr/src/app
 
-COPY requirements.txt /usr/src/app/
-RUN pip install --no-cache-dir -r requirements.txt && \
-    pip install --no-cache-dir tornado esptool
-
 COPY docker/platformio.ini /usr/src/app/
 RUN platformio settings set enable_telemetry No && \
     platformio run -e espressif32 -e espressif8266; exit 0
 
 COPY . .
 RUN pip install --no-cache-dir -e . && \
-    pip install --no-cache-dir tzlocal
+    pip install --no-cache-dir tzlocal pillow
 
 WORKDIR /config
 ENTRYPOINT ["esphomeyaml"]
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index ada69b892..dc87801b5 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -3,4 +3,4 @@ FROM python:2.7
 COPY requirements.txt /requirements.txt
 
 RUN pip install -r /requirements.txt && \
-    pip install flake8==3.5.0 pylint==1.8.4 tzlocal pillow
+    pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow
diff --git a/requirements.txt b/requirements.txt
index 11a5a0924..fab53df52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-voluptuous==0.11.1
-platformio==3.5.2
-pyyaml==3.12
-paho-mqtt==1.3.1
-colorlog==3.1.2
-tornado==5.0.2
-esptool==2.3.1
+voluptuous>=0.11.1
+platformio>=3.5.3
+pyyaml>=3.12
+paho-mqtt>=1.3.1
+colorlog>=3.1.2
+tornado>=5.0.0
+esptool>=2.3.1
diff --git a/setup.py b/setup.py
index 2b5e80e46..3ae63df3d 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ DOWNLOAD_URL = '{}/archive/{}.zip'.format(GITHUB_URL, const.__version__)
 
 REQUIRES = [
     'voluptuous>=0.11.1',
-    'platformio>=3.5.2',
+    'platformio>=3.5.3',
     'pyyaml>=3.12',
     'paho-mqtt>=1.3.1',
     'colorlog>=3.1.2',