mirror of
https://github.com/esphome/esphome.git
synced 2024-11-26 17:05:21 +01:00
Upgrade dependencies
This commit is contained in:
parent
d44ce82aa1
commit
0b04d143ac
7 changed files with 30 additions and 25 deletions
|
@ -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_)
|
||||
|
||||
|
|
|
@ -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,
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
14
setup.py
14
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 = [
|
||||
|
|
Loading…
Reference in a new issue