sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Bump version to 1.2.1

Browse Source
This commit is contained in:
Otto Winter
2018-04-07 12:01:50 +02:00
parent ffd4e3cb66
commit 5f52830662
7 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -11,7 +11,7 @@ RUN pip install --no-cache-dir -r requirements.txt
COPY docker/platformio.ini /usr/src/app/ COPY docker/platformio.ini /usr/src/app/
RUN platformio settings set enable_telemetry No && \ RUN platformio settings set enable_telemetry No && \
platformio lib --global install esphomelib && \ platformio lib --global install esphomelib=https://github.com/OttoWinter/esphomelib.git#v1.2.1 && \
platformio run -e espressif32 -e espressif8266; exit 0 platformio run -e espressif32 -e espressif8266; exit 0
# Fix issue with static IP on ESP32: https://github.com/espressif/arduino-esp32/issues/1081 # Fix issue with static IP on ESP32: https://github.com/espressif/arduino-esp32/issues/1081

2
esphomeyaml/components/mqtt.py
View File

@@ -22,6 +22,8 @@ def validate_broker(value):
u" Please specify the static IP instead.") u" Please specify the static IP instead.")
if u':' in value: if u':' in value:
raise vol.Invalid(u"Please specify the port using the port: option") raise vol.Invalid(u"Please specify the port using the port: option")
if not value:
raise vol.Invalid(u"Broker cannot be empty")
return value return value

2
esphomeyaml/config.py
View File

@@ -18,7 +18,7 @@ from esphomeyaml.helpers import App, add, add_task, color
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DEFAULT_LIBRARY_URI = u'esphomelib' DEFAULT_LIBRARY_URI = u'https://github.com/OttoWinter/esphomelib.git#v1.2.1'
CORE_SCHEMA = vol.Schema({ CORE_SCHEMA = vol.Schema({
vol.Required(CONF_NAME): cv.valid_name, vol.Required(CONF_NAME): cv.valid_name,

6
esphomeyaml/const.py
View File

@@ -1,8 +1,8 @@
"""Constants used by esphomeyaml.""" """Constants used by esphomeyaml."""
MAJOR_VERSION = 0 MAJOR_VERSION = 1
MINOR_VERSION = 1 MINOR_VERSION = 2
PATCH_VERSION = '0' PATCH_VERSION = '1'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)

2
esphomeyaml/wizard.py
View File

@@ -267,7 +267,7 @@ def wizard(path):
mqtt_username=mqtt_username, mqtt_password=mqtt_password) mqtt_username=mqtt_username, mqtt_password=mqtt_password)
if ota_password: if ota_password:
config += "ota:\n password: '{}'".format(ota_password) config += "ota:\n password: '{}'\n".format(ota_password)
else: else:
config += "ota:\n" config += "ota:\n"

2
setup.cfg Normal file
View File

@@ -0,0 +1,2 @@
[metadata]
description-file = README.md

9
setup.py
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
"""esphomeyaml setup script.""" """esphomeyaml setup script."""
from setuptools import setup from setuptools import setup, find_packages
from esphomeyaml import const from esphomeyaml import const
@@ -9,11 +9,11 @@ PROJECT_PACKAGE_NAME = 'esphomeyaml'
PROJECT_LICENSE = 'MIT' PROJECT_LICENSE = 'MIT'
PROJECT_AUTHOR = 'Otto Winter' PROJECT_AUTHOR = 'Otto Winter'
PROJECT_COPYRIGHT = '2018, Otto Winter' PROJECT_COPYRIGHT = '2018, Otto Winter'
PROJECT_URL = 'http://esphomelib.com/' PROJECT_URL = 'https://esphomelib.com/esphomeyaml/index.html'
PROJECT_EMAIL = 'contact@otto-winter.com' PROJECT_EMAIL = 'contact@otto-winter.com'
PROJECT_GITHUB_USERNAME = 'OttoWinter' PROJECT_GITHUB_USERNAME = 'OttoWinter'
PROJECT_GITHUB_REPOSITORY = 'esphomelib' PROJECT_GITHUB_REPOSITORY = 'esphomeyaml'
PYPI_URL = 'https://pypi.python.org/pypi/{}'.format(PROJECT_PACKAGE_NAME) PYPI_URL = 'https://pypi.python.org/pypi/{}'.format(PROJECT_PACKAGE_NAME)
GITHUB_PATH = '{}/{}'.format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY) GITHUB_PATH = '{}/{}'.format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY)
@@ -59,5 +59,6 @@ setup(
'console_scripts': [ 'console_scripts': [
'esphomeyaml = esphomeyaml.__main__:main' 'esphomeyaml = esphomeyaml.__main__:main'
] ]
} },
packages=find_packages()
) )