From d56edd46bbc04b090cff4fbdfa64db42dfd7d33b Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 2 Nov 2014 16:22:59 -0800 Subject: [PATCH] Phue: Switched to GIT-version because pip version lacks behind --- .gitmodules | 3 +++ Dockerfile | 3 --- homeassistant/components/light/__init__.py | 2 +- homeassistant/external/phue | 1 + requirements.txt | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 homeassistant/external/phue diff --git a/.gitmodules b/.gitmodules index 8ea8376a6a4..12316f30e72 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "homeassistant/external/pywemo"] path = homeassistant/external/pywemo url = https://github.com/balloob/pywemo.git +[submodule "homeassistant/external/phue"] + path = homeassistant/external/phue + url = https://github.com/studioimaginaire/phue.git diff --git a/Dockerfile b/Dockerfile index 7e37fc25f2b..5c4cfc78704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,6 @@ FROM python:3-onbuild MAINTAINER Paulus Schoutsen -# Temporary fix while waiting for new version of phue to be released -RUN curl https://raw.githubusercontent.com/studioimaginaire/phue/master/phue.py -o phue.py - VOLUME /config EXPOSE 8123 diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py index a2595f51ae3..a59249ea2ef 100644 --- a/homeassistant/components/light/__init__.py +++ b/homeassistant/components/light/__init__.py @@ -362,7 +362,7 @@ class HueLightControl(object): host = config.get(ha.CONF_HOST, None) try: - import phue + import homeassistant.external.phue.phue as phue except ImportError: logger.exception( "HueLightControl:Error while importing dependency phue.") diff --git a/homeassistant/external/phue b/homeassistant/external/phue new file mode 160000 index 00000000000..c96d8d5dbe0 --- /dev/null +++ b/homeassistant/external/phue @@ -0,0 +1 @@ +Subproject commit c96d8d5dbe08adfe3919734c1c8403cd7ec4873e diff --git a/requirements.txt b/requirements.txt index 97bf954c46d..48b5da9774e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ requests>=2.0 -phue>=0.7 pychromecast>=0.5 pyephem>=3.7 pyuserinput>=0.1.9