Otto Winter 2019-12-04 17:13:34 +01:00 committed by GitHub
parent 33c08812cc
commit bba6d6897d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 37 additions and 32 deletions

View file

@ -301,17 +301,17 @@ def setup_time_core_(time_var, config):
for conf in config.get(CONF_ON_TIME, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], time_var)
seconds = conf.get(CONF_SECONDS, [x for x in range(0, 61)])
seconds = conf.get(CONF_SECONDS, list(range(0, 61)))
cg.add(trigger.add_seconds(seconds))
minutes = conf.get(CONF_MINUTES, [x for x in range(0, 60)])
minutes = conf.get(CONF_MINUTES, list(range(0, 60)))
cg.add(trigger.add_minutes(minutes))
hours = conf.get(CONF_HOURS, [x for x in range(0, 24)])
hours = conf.get(CONF_HOURS, list(range(0, 24)))
cg.add(trigger.add_hours(hours))
days_of_month = conf.get(CONF_DAYS_OF_MONTH, [x for x in range(1, 32)])
days_of_month = conf.get(CONF_DAYS_OF_MONTH, list(range(1, 32)))
cg.add(trigger.add_days_of_month(days_of_month))
months = conf.get(CONF_MONTHS, [x for x in range(1, 13)])
months = conf.get(CONF_MONTHS, list(range(1, 13)))
cg.add(trigger.add_months(months))
days_of_week = conf.get(CONF_DAYS_OF_WEEK, [x for x in range(1, 8)])
days_of_week = conf.get(CONF_DAYS_OF_WEEK, list(range(1, 8)))
cg.add(trigger.add_days_of_week(days_of_week))
yield cg.register_component(trigger, conf)

View file

@ -8,7 +8,7 @@ import os
import re
# pylint: disable=unused-import, wrong-import-order
from typing import Any, Dict, List # noqa
from typing import Any, Dict, List, Optional, Set # noqa
from esphome.const import CONF_ARDUINO_VERSION, SOURCE_FILE_EXTENSIONS, \
CONF_COMMENT, CONF_ESPHOME, CONF_USE_ADDRESS, CONF_WIFI
@ -271,7 +271,7 @@ class ID(object):
else:
self.is_manual = is_manual
self.is_declaration = is_declaration
self.type = type # type: Optional[MockObjClass]
self.type = type # type: Optional['MockObjClass']
def resolve(self, registered_ids):
from esphome.config_validation import RESERVED_IDS
@ -489,11 +489,11 @@ class EsphomeCore(object):
# Task counter for pending tasks
self.task_counter = 0
# The variable cache, for each ID this holds a MockObj of the variable obj
self.variables = {} # type: Dict[str, MockObj]
self.variables = {} # type: Dict[str, 'MockObj']
# A list of statements that go in the main setup() block
self.main_statements = [] # type: List[Statement]
self.main_statements = [] # type: List['Statement']
# A list of statements to insert in the global block (includes and global variables)
self.global_statements = [] # type: List[Statement]
self.global_statements = [] # type: List['Statement']
# A set of platformio libraries to add to the project
self.libraries = [] # type: List[Library]
# A set of build flags to set in the platformio project

View file

@ -59,7 +59,7 @@ def register_parented(var, value):
def extract_registry_entry_config(registry, full_config):
# type: (Registry, ConfigType) -> RegistryEntry
# type: ('Registry', 'ConfigType') -> 'RegistryEntry'
key, config = next((k, v) for k, v in full_config.items() if k in registry)
return registry[key], config

View file

@ -10,8 +10,8 @@ from esphome.core import CORE
from esphome.helpers import write_file_if_changed
# pylint: disable=unused-import, wrong-import-order
from esphome.core import CoreType # noqa
from typing import Any, Dict, Optional # noqa
from esphome.core import CoreType
from typing import Any, Optional, List
from esphome.py_compat import text_type

View file

@ -3,10 +3,14 @@ from __future__ import print_function
import json
import os
from esphome.config import load_config, _format_vol_invalid
from esphome.core import CORE
from esphome.config import load_config, _format_vol_invalid, Config
from esphome.core import CORE, DocumentRange
from esphome.py_compat import text_type, safe_input
# pylint: disable=unused-import, wrong-import-order
import voluptuous as vol
from typing import Optional
def _get_invalid_range(res, invalid):
# type: (Config, vol.Invalid) -> Optional[DocumentRange]

View file

@ -291,7 +291,7 @@ def copy_src_tree():
source_files.update(component.source_files)
# Convert to list and sort
source_files_l = [it for it in source_files.items()]
source_files_l = list(source_files.items())
source_files_l.sort()
# Build #include list for esphome.h

View file

@ -24,6 +24,7 @@ disable=
useless-object-inheritance,
stop-iteration-return,
no-self-use,
import-outside-toplevel,
additional-builtins=

View file

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

View file

@ -1,19 +1,19 @@
voluptuous==0.11.7
PyYAML==5.1.2
paho-mqtt==1.4.0
PyYAML==5.2
paho-mqtt==1.5.0
colorlog==4.0.2
tornado==5.1.1
typing>=3.6.6;python_version<"3.5"
protobuf==3.10.0
protobuf==3.11.1
tzlocal==2.0.0
pytz==2019.3
pyserial==3.4
ifaddr==0.1.6
platformio==4.0.3
platformio==4.1.0
esptool==2.7
pylint==1.9.4 ; python_version<"3"
pylint==2.3.0 ; python_version>"3"
flake8==3.6.0
pylint==2.4.4 ; python_version>"3"
flake8==3.7.9
pillow
pexpect

View file

@ -18,7 +18,7 @@ Topic :: Home Automation
[flake8]
max-line-length = 120
builtins = unicode, long, raw_input
builtins = unicode, long, raw_input, basestring
exclude = api_pb2.py
[bdist_wheel]

View file

@ -24,12 +24,12 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
REQUIRES = [
'voluptuous==0.11.7',
'PyYAML==5.1.2',
'paho-mqtt==1.4.0',
'PyYAML==5.2',
'paho-mqtt==1.5.0',
'colorlog==4.0.2',
'tornado==5.1.1',
'typing>=3.6.6;python_version<"3.6"',
'protobuf==3.10.0',
'protobuf==3.11.1',
'tzlocal==2.0.0',
'pytz==2019.3',
'pyserial==3.4',
@ -41,7 +41,7 @@ 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.1.0',
'esptool==2.7',
])