Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Upgrade dependencies

Browse source
This commit is contained in:
Niklas Wagner 2020-05-24 01:33:58 +02:00 committed by GitHub
parent 153aadadae
commit c2e0ea97d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/core.py
View file

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

11
esphome/core_config.py
View file

@ -11,7 +11,8 @@ from esphome.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266_DEV
CONF_NAME, CONF_ON_BOOT, CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, \ CONF_NAME, CONF_ON_BOOT, CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, \
CONF_PLATFORMIO_OPTIONS, CONF_PRIORITY, CONF_TRIGGER_ID, \ CONF_PLATFORMIO_OPTIONS, CONF_PRIORITY, CONF_TRIGGER_ID, \
CONF_ESP8266_RESTORE_FROM_FLASH, ARDUINO_VERSION_ESP8266_2_3_0, \ CONF_ESP8266_RESTORE_FROM_FLASH, ARDUINO_VERSION_ESP8266_2_3_0, \
ARDUINO_VERSION_ESP8266_2_5_0, ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2 ARDUINO_VERSION_ESP8266_2_5_0, ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2, \
ESP_PLATFORMS
from esphome.core import CORE, coroutine_with_priority from esphome.core import CORE, coroutine_with_priority
from esphome.helpers import copy_file_if_changed, walk_files from esphome.helpers import copy_file_if_changed, walk_files
from esphome.pins import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS from esphome.pins import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
@ -42,10 +43,10 @@ def validate_board(value):
return value return value
validate_platform = cv.one_of('ESP32', 'ESP8266', upper=True) validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
PLATFORMIO_ESP8266_LUT = { PLATFORMIO_ESP8266_LUT = {
'2.6.3': 'espressif8266@2.3.2', '2.6.3': 'espressif8266@2.4.0',
'2.6.2': 'espressif8266@2.3.1', '2.6.2': 'espressif8266@2.3.1',
'2.6.1': 'espressif8266@2.3.0', '2.6.1': 'espressif8266@2.3.0',
'2.5.2': 'espressif8266@2.2.3', '2.5.2': 'espressif8266@2.2.3',
@ -65,8 +66,8 @@ PLATFORMIO_ESP32_LUT = {
'1.0.1': 'espressif32@1.6.0', '1.0.1': 'espressif32@1.6.0',
'1.0.2': 'espressif32@1.9.0', '1.0.2': 'espressif32@1.9.0',
'1.0.3': 'espressif32@1.10.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', 'LATEST': 'espressif32',
'DEV': ARDUINO_VERSION_ESP32_DEV, 'DEV': ARDUINO_VERSION_ESP32_DEV,
} }

4
esphome/cpp_generator.py
View file

@ -219,6 +219,7 @@ class StringLiteral(Literal):
__slots__ = ("string", ) __slots__ = ("string", )
def __init__(self, string: str): def __init__(self, string: str):
super().__init__()
self.string = string self.string = string
def __str__(self): def __str__(self):
@ -229,6 +230,7 @@ class IntLiteral(Literal):
__slots__ = ("i", ) __slots__ = ("i", )
def __init__(self, i: int): def __init__(self, i: int):
super().__init__()
self.i = i self.i = i
def __str__(self): def __str__(self):
@ -256,6 +258,7 @@ class HexIntLiteral(Literal):
__slots__ = ("i", ) __slots__ = ("i", )
def __init__(self, i: int): def __init__(self, i: int):
super().__init__()
self.i = HexInt(i) self.i = HexInt(i)
def __str__(self): def __str__(self):
@ -266,6 +269,7 @@ class FloatLiteral(Literal):
__slots__ = ("f", ) __slots__ = ("f", )
def __init__(self, value: float): def __init__(self, value: float):
super().__init__()
self.f = value self.f = value
def __str__(self): def __str__(self):

2
esphome/voluptuous_schema.py
View file

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

2
platformio.ini
View file

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

14
requirements.txt
View file

@ -1,12 +1,12 @@
voluptuous==0.11.7 voluptuous==0.11.7
PyYAML==5.2 PyYAML==5.3.1
paho-mqtt==1.5.0 paho-mqtt==1.5.0
colorlog==4.0.2 colorlog==4.1.0
tornado==5.1.1 tornado==6.0.4
protobuf==3.11.1 protobuf==3.11.3
tzlocal==2.0.0 tzlocal==2.0.0
pytz==2019.3 pytz==2020.1
pyserial==3.4 pyserial==3.4
ifaddr==0.1.6 ifaddr==0.1.6
platformio==4.1.0 platformio==4.3.3
esptool==2.7 esptool==2.8

21
requirements_test.txt
View file

@ -1,25 +1,24 @@
voluptuous==0.11.7 voluptuous==0.11.7
PyYAML==5.2 PyYAML==5.3.1
paho-mqtt==1.5.0 paho-mqtt==1.5.0
colorlog==4.0.2 colorlog==4.1.0
tornado==5.1.1 tornado==6.0.4
protobuf==3.11.1 protobuf==3.11.3
tzlocal==2.0.0 tzlocal==2.0.0
pytz==2019.3 pytz==2020.1
pyserial==3.4 pyserial==3.4
ifaddr==0.1.6 ifaddr==0.1.6
platformio==4.1.0 platformio==4.3.3
esptool==2.7 esptool==2.8
pylint==1.9.4 ; python_version<"3" pylint==2.5.0
pylint==2.4.4 ; python_version>"3"
flake8==3.7.9 flake8==3.7.9
pillow pillow
pexpect pexpect
# Unit tests # Unit tests
pytest==5.3.2 pytest==5.4.1
pytest-cov==2.8.1 pytest-cov==2.8.1
pytest-mock==1.13.0 pytest-mock==1.13.0
asyncmock==0.4.2 asyncmock==0.4.2
hypothesis==4.57.0 hypothesis==5.10.4

14
setup.py
View file

@ -24,13 +24,13 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
REQUIRES = [ REQUIRES = [
'voluptuous==0.11.7', 'voluptuous==0.11.7',
'PyYAML==5.2', 'PyYAML==5.3.1',
'paho-mqtt==1.5.0', 'paho-mqtt==1.5.0',
'colorlog==4.0.2', 'colorlog==4.1.0',
'tornado==5.1.1', 'tornado==6.0.4',
'protobuf==3.11.1', 'protobuf==3.11.3',
'tzlocal==2.0.0', 'tzlocal==2.0.0',
'pytz==2019.3', 'pytz==2020.1',
'pyserial==3.4', 'pyserial==3.4',
'ifaddr==0.1.6', 'ifaddr==0.1.6',
] ]
@ -40,8 +40,8 @@ REQUIRES = [
# This means they have to be in your $PATH. # This means they have to be in your $PATH.
if os.environ.get('ESPHOME_USE_SUBPROCESS') is None: if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
REQUIRES.extend([ REQUIRES.extend([
'platformio==4.1.0', 'platformio==4.3.3',
'esptool==2.7', 'esptool==2.8',
]) ])
CLASSIFIERS = [ CLASSIFIERS = [