Merge branch '1.14.4'

.gitignore

@@ -114,3 +114,4 @@ config/
 tests/build/
 tests/.esphome/
 /.temp-clang-tidy.cpp
+/.idea/

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '2.0.1'
+  BASE_VERSION: '2.1.1'
   TZ: UTC
 
 stages:
@@ -33,7 +33,7 @@ stages:
     - docker info
     - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
   script:
-    - docker run --rm --privileged multiarch/qemu-user-static:4.1.0-1 --reset -p yes
+    - docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
     - TAG="${CI_COMMIT_TAG#v}"
     - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
     - echo "Tag ${TAG}"

docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.1
 FROM ${BUILD_FROM}
 
 COPY . .

docker/Dockerfile.lint

@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.0.1
+FROM esphome/esphome-base-amd64:2.1.1
 
 RUN \
     apt-get update \

esphome/core.py

@@ -567,10 +567,12 @@ class EsphomeCore(object):
         return os.path.basename(self.config_path)
 
     def relative_config_path(self, *path):
+        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.config_dir, path_)
 
     def relative_build_path(self, *path):
+        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.build_path, path_)
 

esphome/core_config.py

@@ -45,6 +45,9 @@ def validate_board(value):
 validate_platform = cv.one_of('ESP32', 'ESP8266', upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
+    '2.6.3': 'espressif8266@2.4.0',
+    '2.6.2': 'espressif8266@2.3.1',
+    '2.6.1': 'espressif8266@2.3.0',
     '2.5.2': 'espressif8266@2.2.3',
     '2.5.1': 'espressif8266@2.1.0',
     '2.5.0': 'espressif8266@2.0.1',
@@ -62,8 +65,8 @@ PLATFORMIO_ESP32_LUT = {
     '1.0.1': 'espressif32@1.6.0',
     '1.0.2': 'espressif32@1.9.0',
     '1.0.3': 'espressif32@1.10.0',
-    '1.0.4': 'espressif32@1.11.0',
+    '1.0.4': 'espressif32@1.12.1',
-    'RECOMMENDED': 'espressif32@1.11.0',
+    'RECOMMENDED': 'espressif32@1.12.1',
     'LATEST': 'espressif32',
     'DEV': ARDUINO_VERSION_ESP32_DEV,
 }

esphome/voluptuous_schema.py

@@ -179,7 +179,7 @@ class _Schema(vol.Schema):
         self._extra_schemas.append(validator)
         return self
 
-    # pylint: disable=arguments-differ
+    # pylint: disable=signature-differs,arguments-differ
     def extend(self, *schemas, **kwargs):
         extra = kwargs.pop('extra', None)
         if kwargs:

platformio.ini

@@ -42,7 +42,7 @@ build_flags = ${common.build_flags}
 src_filter = ${common.src_filter} +<tests/livingroom8266.cpp>
 
 [env:livingroom32]
-platform = espressif32@1.11.0
+platform = espressif32@1.12.1
 board = nodemcu-32s
 framework = arduino
 lib_deps = ${common.lib_deps}

requirements.txt

@@ -1,13 +1,13 @@
 voluptuous==0.11.7
-PyYAML==5.1.2
+PyYAML==5.3.1
-paho-mqtt==1.4.0
+paho-mqtt==1.5.0
-colorlog==4.0.2
+colorlog==4.1.0
 tornado==5.1.1
 typing>=3.6.6;python_version<"3.5"
-protobuf==3.10.0
+protobuf==3.11.3
 tzlocal==2.0.0
-pytz==2019.3
+pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.0.3
+platformio==4.3.4
-esptool==2.7
+esptool==2.8

requirements_test.txt

@@ -1,16 +1,16 @@
 voluptuous==0.11.7
-PyYAML==5.1.2
+PyYAML==5.3.1
-paho-mqtt==1.4.0
+paho-mqtt==1.5.0
-colorlog==4.0.2
+colorlog==4.1.0
 tornado==5.1.1
 typing>=3.6.6;python_version<"3.5"
-protobuf==3.10.0
+protobuf==3.11.3
 tzlocal==2.0.0
-pytz==2019.3
+pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.0.3
+platformio==4.3.4
-esptool==2.7
+esptool==2.8
 
 pylint==1.9.4 ; python_version<"3"
 pylint==2.3.0 ; python_version>"3"

setup.py

@@ -24,14 +24,14 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
 
 REQUIRES = [
     'voluptuous==0.11.7',
-    'PyYAML==5.1.2',
+    'PyYAML==5.3.1',
-    'paho-mqtt==1.4.0',
+    'paho-mqtt==1.5.0',
-    'colorlog==4.0.2',
+    'colorlog==4.1.0',
     'tornado==5.1.1',
     'typing>=3.6.6;python_version<"3.6"',
-    'protobuf==3.10.0',
+    'protobuf==3.11.3',
     'tzlocal==2.0.0',
-    'pytz==2019.3',
+    'pytz==2020.1',
     'pyserial==3.4',
     'ifaddr==0.1.6',
 ]
@@ -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==4.0.3',
+        'platformio==4.3.4',
-        'esptool==2.7',
+        'esptool==2.8',
     ])
 
 CLASSIFIERS = [