sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-15 15:18:16 +00:00
Code Issues Releases Wiki Activity

Download Efficiency

Browse Source
This commit is contained in:
Otto Winter 2018-11-25 20:46:41 +01:00
parent 795dd716c9
commit 44db018d4f
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -11,6 +11,8 @@ stages:
.lint: &lint .lint: &lint
stage: lint stage: lint
before_script:
- pip install -e .
tags: tags:
- python2.7 - python2.7
- esphomeyaml-lint - esphomeyaml-lint

1
esphomeyaml/core_config.py
View File

@ -19,6 +19,7 @@ from esphomeyaml.cpp_types import App, NoArg, const_char_ptr, esphomelib_ns
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
LIBRARY_URI_REPO = u'https://github.com/OttoWinter/esphomelib.git' LIBRARY_URI_REPO = u'https://github.com/OttoWinter/esphomelib.git'
GITHUB_ARCHIVE_ZIP = u'https://github.com/OttoWinter/esphomelib/archive/{}.zip'
BUILD_FLASH_MODES = ['qio', 'qout', 'dio', 'dout'] BUILD_FLASH_MODES = ['qio', 'qout', 'dio', 'dout']
StartupTrigger = esphomelib_ns.StartupTrigger StartupTrigger = esphomelib_ns.StartupTrigger

2
esphomeyaml/wizard.py
View File

@ -86,7 +86,7 @@ def wizard_write(path, **kwargs):
name = kwargs['name'] name = kwargs['name']
board = kwargs['board'] board = kwargs['board']
if 'platform' not in kwargs: if 'platform' not in kwargs:
kwargs['platform'] = 'ESP8266' if board in ESP32_BOARD_PINS else 'ESP32' kwargs['platform'] = 'ESP8266' if board in ESP8266_BOARD_PINS else 'ESP32'
platform = kwargs['platform'] platform = kwargs['platform']
with codecs.open(path, 'w') as f_handle: with codecs.open(path, 'w') as f_handle:

10
esphomeyaml/writer.py
View File

@ -12,7 +12,7 @@ from esphomeyaml.const import ARDUINO_VERSION_ESP32_DEV, CONF_ARDUINO_VERSION, \
CONF_BOARD_FLASH_MODE, CONF_BRANCH, CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, \ CONF_BOARD_FLASH_MODE, CONF_BRANCH, CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, \
CONF_LOCAL, CONF_REPOSITORY, CONF_TAG, CONF_USE_CUSTOM_CODE CONF_LOCAL, CONF_REPOSITORY, CONF_TAG, CONF_USE_CUSTOM_CODE
from esphomeyaml.core import CORE, EsphomeyamlError from esphomeyaml.core import CORE, EsphomeyamlError
from esphomeyaml.core_config import VERSION_REGEX from esphomeyaml.core_config import VERSION_REGEX, LIBRARY_URI_REPO, GITHUB_ARCHIVE_ZIP
from esphomeyaml.helpers import mkdir_p, run_system_command from esphomeyaml.helpers import mkdir_p, run_system_command
from esphomeyaml.storage_json import StorageJSON, storage_path from esphomeyaml.storage_json import StorageJSON, storage_path
from esphomeyaml.util import safe_print from esphomeyaml.util import safe_print
@ -222,11 +222,13 @@ def gather_lib_deps():
lib_deps = set() lib_deps = set()
esphomelib_version = CORE.config[CONF_ESPHOMEYAML][CONF_ESPHOMELIB_VERSION] esphomelib_version = CORE.config[CONF_ESPHOMEYAML][CONF_ESPHOMELIB_VERSION]
if CONF_REPOSITORY in esphomelib_version: if CONF_REPOSITORY in esphomelib_version:
repo = esphomelib_version[CONF_REPOSITORY]
ref = next((esphomelib_version[x] for x in (CONF_COMMIT, CONF_BRANCH, CONF_TAG) ref = next((esphomelib_version[x] for x in (CONF_COMMIT, CONF_BRANCH, CONF_TAG)
if x in esphomelib_version), None) if x in esphomelib_version), None)
this_version = esphomelib_version[CONF_REPOSITORY] if CONF_TAG in esphomelib_version and repo == LIBRARY_URI_REPO:
if ref is not None: this_version = GITHUB_ARCHIVE_ZIP.format(ref)
this_version += '#' + ref elif ref is not None:
this_version = repo + '#' + ref
lib_deps.add(this_version) lib_deps.add(this_version)
elif CORE.is_local_esphomelib_copy: elif CORE.is_local_esphomelib_copy:
src_path = CORE.relative_path(esphomelib_version[CONF_LOCAL]) src_path = CORE.relative_path(esphomelib_version[CONF_LOCAL])