From 0b04d143acbb60c07b4df01d1ad6f6ed18830785 Mon Sep 17 00:00:00 2001 From: Niklas Wagner Date: Sun, 24 May 2020 01:33:58 +0200 Subject: [PATCH 1/5] Upgrade dependencies --- esphome/core.py | 2 ++ esphome/core_config.py | 7 +++++-- esphome/voluptuous_schema.py | 2 +- platformio.ini | 2 +- requirements.txt | 14 +++++++------- requirements_test.txt | 14 +++++++------- setup.py | 14 +++++++------- 7 files changed, 30 insertions(+), 25 deletions(-) diff --git a/esphome/core.py b/esphome/core.py index 82ce196cab..e0443868bf 100644 --- a/esphome/core.py +++ b/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_) diff --git a/esphome/core_config.py b/esphome/core_config.py index f63d2e17e3..7f4ccaceb7 100644 --- a/esphome/core_config.py +++ b/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', - 'RECOMMENDED': 'espressif32@1.11.0', + '1.0.4': 'espressif32@1.12.1', + 'RECOMMENDED': 'espressif32@1.12.1', 'LATEST': 'espressif32', 'DEV': ARDUINO_VERSION_ESP32_DEV, } diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py index 09fa1a6756..00dcd1efad 100644 --- a/esphome/voluptuous_schema.py +++ b/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 def extend(self, *schemas, **kwargs): extra = kwargs.pop('extra', None) if kwargs: diff --git a/platformio.ini b/platformio.ini index 4e1ef1d294..b50ea411d3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -42,7 +42,7 @@ build_flags = ${common.build_flags} src_filter = ${common.src_filter} + [env:livingroom32] -platform = espressif32@1.11.0 +platform = espressif32@1.12.1 board = nodemcu-32s framework = arduino lib_deps = ${common.lib_deps} diff --git a/requirements.txt b/requirements.txt index 14ce062000..66e0a7fb3a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ voluptuous==0.11.7 -PyYAML==5.1.2 -paho-mqtt==1.4.0 -colorlog==4.0.2 +PyYAML==5.3.1 +paho-mqtt==1.5.0 +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 -esptool==2.7 +platformio==4.3.4 +esptool==2.8 diff --git a/requirements_test.txt b/requirements_test.txt index 26f14434d8..9a18019e0e 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,16 +1,16 @@ voluptuous==0.11.7 -PyYAML==5.1.2 -paho-mqtt==1.4.0 -colorlog==4.0.2 +PyYAML==5.3.1 +paho-mqtt==1.5.0 +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 -esptool==2.7 +platformio==4.3.4 +esptool==2.8 pylint==1.9.4 ; python_version<"3" pylint==2.3.0 ; python_version>"3" diff --git a/setup.py b/setup.py index 641bb3e431..3a34e750b5 100755 --- a/setup.py +++ b/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', - 'paho-mqtt==1.4.0', - 'colorlog==4.0.2', + 'PyYAML==5.3.1', + 'paho-mqtt==1.5.0', + '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', - 'esptool==2.7', + 'platformio==4.3.4', + 'esptool==2.8', ]) CLASSIFIERS = [ From 310e2a0b2059641adee53720568bb64de3bdc398 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Fri, 5 Jun 2020 12:25:29 +0200 Subject: [PATCH 2/5] Fix build --- esphome/voluptuous_schema.py | 2 +- tests/test1.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py index 00dcd1efad..6068582555 100644 --- a/esphome/voluptuous_schema.py +++ b/esphome/voluptuous_schema.py @@ -179,7 +179,7 @@ class _Schema(vol.Schema): self._extra_schemas.append(validator) return self - # pylint: disable=signature-differs + # pylint: disable=signature-differs,arguments-differ def extend(self, *schemas, **kwargs): extra = kwargs.pop('extra', None) if kwargs: diff --git a/tests/test1.yaml b/tests/test1.yaml index c4b27ba250..9fb4bb7af9 100644 --- a/tests/test1.yaml +++ b/tests/test1.yaml @@ -261,10 +261,10 @@ sensor: name: "EMON CT1 Current" power: name: "EMON Active Power CT1" - reactive_power: - name: "EMON Reactive Power CT1" - power_factor: - name: "EMON Power Factor CT1" + # reactive_power: + # name: "EMON Reactive Power CT1" + # power_factor: + # name: "EMON Power Factor CT1" gain_voltage: 47660 gain_ct: 12577 phase_b: From aae4b2ea5d9696717e433fc2d1e6395ce1be59e2 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Fri, 5 Jun 2020 11:34:51 +0200 Subject: [PATCH 3/5] Upgrade docker base image to 2.1.0 --- .gitlab-ci.yml | 4 ++-- docker/Dockerfile | 2 +- docker/Dockerfile.lint | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3db0b982ae..e3df652f67 100644 --- a/.gitlab-ci.yml +++ b/.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.0' 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}" diff --git a/docker/Dockerfile b/docker/Dockerfile index 11bbeeda2b..01ff8f048b 100644 --- a/docker/Dockerfile +++ b/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.0 FROM ${BUILD_FROM} COPY . . diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint index 5d8893bdbe..47b1520aa3 100644 --- a/docker/Dockerfile.lint +++ b/docker/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM esphome/esphome-base-amd64:2.0.1 +FROM esphome/esphome-base-amd64:2.1.0 RUN \ apt-get update \ From c7dddaded4b6e15bb58ecdcc366392bc0acdca03 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Fri, 5 Jun 2020 12:28:37 +0200 Subject: [PATCH 4/5] Upgrade docker base image to 2.1.1 --- .gitlab-ci.yml | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.lint | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3df652f67..cdb2693f46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_HOST: tcp://docker:2375/ - BASE_VERSION: '2.1.0' + BASE_VERSION: '2.1.1' TZ: UTC stages: diff --git a/docker/Dockerfile b/docker/Dockerfile index 01ff8f048b..bcdc5feaf7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.0 +ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.1 FROM ${BUILD_FROM} COPY . . diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint index 47b1520aa3..e65aebcccb 100644 --- a/docker/Dockerfile.lint +++ b/docker/Dockerfile.lint @@ -1,4 +1,4 @@ -FROM esphome/esphome-base-amd64:2.1.0 +FROM esphome/esphome-base-amd64:2.1.1 RUN \ apt-get update \ From 3a597c5aa62e7b9eab04e51f9c3c377fbe09255d Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Fri, 5 Jun 2020 12:38:05 +0200 Subject: [PATCH 5/5] Fix gitignore intellij idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b004947390..7210a808dc 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ config/ tests/build/ tests/.esphome/ /.temp-clang-tidy.cpp +/.idea/