From d5b4971d812bf6f2cd4cfe0c7f824735b7423eb0 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sat, 7 Apr 2018 12:01:50 +0200 Subject: [PATCH] Bump version to 1.2.1 --- Dockerfile | 2 +- esphomeyaml/components/mqtt.py | 2 ++ esphomeyaml/config.py | 2 +- esphomeyaml/const.py | 6 +++--- esphomeyaml/wizard.py | 2 +- setup.cfg | 2 ++ setup.py | 9 +++++---- 7 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 setup.cfg diff --git a/Dockerfile b/Dockerfile index 52196f3460..951351aa6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN pip install --no-cache-dir -r requirements.txt COPY docker/platformio.ini /usr/src/app/ 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 # Fix issue with static IP on ESP32: https://github.com/espressif/arduino-esp32/issues/1081 diff --git a/esphomeyaml/components/mqtt.py b/esphomeyaml/components/mqtt.py index 7fc0ea9200..d3cf3abece 100644 --- a/esphomeyaml/components/mqtt.py +++ b/esphomeyaml/components/mqtt.py @@ -22,6 +22,8 @@ def validate_broker(value): u" Please specify the static IP instead.") if u':' in value: 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 diff --git a/esphomeyaml/config.py b/esphomeyaml/config.py index 0550152473..6c5fe2ce15 100644 --- a/esphomeyaml/config.py +++ b/esphomeyaml/config.py @@ -18,7 +18,7 @@ from esphomeyaml.helpers import App, add, add_task, color _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({ vol.Required(CONF_NAME): cv.valid_name, diff --git a/esphomeyaml/const.py b/esphomeyaml/const.py index b25e4ac8b4..5fe1d7721d 100644 --- a/esphomeyaml/const.py +++ b/esphomeyaml/const.py @@ -1,8 +1,8 @@ """Constants used by esphomeyaml.""" -MAJOR_VERSION = 0 -MINOR_VERSION = 1 -PATCH_VERSION = '0' +MAJOR_VERSION = 1 +MINOR_VERSION = 2 +PATCH_VERSION = '1' __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) diff --git a/esphomeyaml/wizard.py b/esphomeyaml/wizard.py index 2f3a078383..394457ac8e 100644 --- a/esphomeyaml/wizard.py +++ b/esphomeyaml/wizard.py @@ -267,7 +267,7 @@ def wizard(path): mqtt_username=mqtt_username, mqtt_password=mqtt_password) if ota_password: - config += "ota:\n password: '{}'".format(ota_password) + config += "ota:\n password: '{}'\n".format(ota_password) else: config += "ota:\n" diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000..b88034e414 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[metadata] +description-file = README.md diff --git a/setup.py b/setup.py index 860d201321..870023beed 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """esphomeyaml setup script.""" -from setuptools import setup +from setuptools import setup, find_packages from esphomeyaml import const @@ -9,11 +9,11 @@ PROJECT_PACKAGE_NAME = 'esphomeyaml' PROJECT_LICENSE = 'MIT' PROJECT_AUTHOR = '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_GITHUB_USERNAME = 'OttoWinter' -PROJECT_GITHUB_REPOSITORY = 'esphomelib' +PROJECT_GITHUB_REPOSITORY = 'esphomeyaml' PYPI_URL = 'https://pypi.python.org/pypi/{}'.format(PROJECT_PACKAGE_NAME) GITHUB_PATH = '{}/{}'.format(PROJECT_GITHUB_USERNAME, PROJECT_GITHUB_REPOSITORY) @@ -59,5 +59,6 @@ setup( 'console_scripts': [ 'esphomeyaml = esphomeyaml.__main__:main' ] - } + }, + packages=find_packages() )