Move to Pypi version of Phue again

LEDTECHCHGO · Nov 22, 2014 · 01f738c · 01f738c
1 parent 4b2fa2d
commit 01f738c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [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/README.md b/README.md
@@ -58,8 +58,6 @@ After you got the demo mode running it is time to enable some real components an
 ### Philips Hue
 To get Philips Hue working you will have to connect Home Assistant to the Hue bridge.
 
-*Note*: Home Assistant depends on a feature of Phue that is available on GitHub but not on Pypi. Home Assistant will include Phue as a git submodule till this issue is resolved. Before using Philips Hue you will have to install the Phue library so it can create a config file. Do so by running from the Home Assistant directory: `pip3 install -e homeassistant/external/phue`.
-
 Run the following command from your config dir and follow the instructions:
 
 ```bash

diff --git a/homeassistant/components/light/hue.py b/homeassistant/components/light/hue.py
@@ -17,9 +17,7 @@ def get_lights(hass, config):
     """ Gets the Hue lights. """
     logger = logging.getLogger(__name__)
     try:
-        # Pylint does not play nice if not every folders has an __init__.py
-        # pylint: disable=no-name-in-module, import-error
-        import homeassistant.external.phue.phue as phue
+        import phue
     except ImportError:
         logger.exception("Error while importing dependency phue.")
 

diff --git a/homeassistant/external/phue b/homeassistant/external/phue
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ requests>=2.0
 pyephem>=3.7
 
 # lights.hue
-# phue>=0.7
+phue>=0.8
 
 # chromecast
 pychromecast>=0.5