merge branch 'dev'

MANIFEST.in

@@ -0,0 +1 @@
+recursive-exclude tests *

homeassistant/components/device_tracker/nmap_tracker.py

@@ -114,7 +114,7 @@ class NmapDeviceScanner(object):
         from nmap import PortScanner, PortScannerError
         scanner = PortScanner()
 
-        options = "-sP --host-timeout 5"
+        options = "-F --host-timeout 5"
         exclude_targets = set()
         if self.home_interval:
             now = dt_util.now()

homeassistant/const.py

@@ -1,6 +1,6 @@
 """ Constants used by Home Assistant components. """
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 # Can be used to specify a catch all when registering state or event listeners.
 MATCH_ALL = '*'

setup.py

@@ -18,8 +18,12 @@ PACKAGE_DATA = \
      'homeassistant.components.frontend.www_static': ['*.*'],
      'homeassistant.components.frontend.www_static.images': ['*.*']}
 
-REQUIRES = \
-    [line.strip() for line in open('requirements.txt', 'r')]
+REQUIRES = [
+    'requests>=2,<3',
+    'pyyaml>=3.11,<4',
+    'pytz>=2015.4',
+    'pip>=7.0.0',
+]
 
 setup(
     name=PACKAGE_NAME,