resolve merge

bin/user/netatmo.py

@@ -42,7 +42,7 @@ import weewx.units
 import weewx.wxformulas
 
 DRIVER_NAME = 'netatmo'
-DRIVER_VERSION = "0.7"
+DRIVER_VERSION = "0.8"
 
 INHG_PER_MBAR = 0.0295299830714
 MPH_TO_KPH = 1.60934
@@ -327,7 +327,7 @@ class CloudClient(Collector):
                     try:
                         CloudClient.get_data(self._sd, self._device_id)
                         break
-                    except urllib2.HTTPError, e:
+                    except (urllib2.HTTPError, urllib2.URLError), e:
                         logerr("failed attempt %s of %s to get data: %s" %
                                (tries + 1, self._max_tries, e))
                         logdbg("waiting %s seconds before retry" %

changelog

@@ -1,6 +1,10 @@
-0.7 22jan2017
+0.8 22jan2017
 * user-specified map augments the default instead of replacing it
-* update license
+
+0.7 16jan2017
+* handle URLError for connection refused
+* include license in the distribution
+* renamed readme
 
 0.6 31oct2016
 * use database_name = hardware_name pattern for sensor mapping

install.py

@@ -10,7 +10,7 @@ def loader():
 class NetatmoInstaller(ExtensionInstaller):
     def __init__(self):
         super(NetatmoInstaller, self).__init__(
-            version="0.7",
+            version="0.8",
             name='netatmo',
             description='Driver for netatmo weather stations.',
             author="Matthew Wall",

readme

@@ -21,20 +21,21 @@ automatically obtains and updates the tokens needed to get data from the
 server.
 
 
+===============================================================================
 Installation instructions:
 
-0) download the driver:
+1) download the driver:
 
 wget -O weewx-netatmo.zip https://github.com/matthewwall/weewx-netatmo/archive/master.zip
 
-1) install the driver:
+2) install the driver:
 
 sudo wee_extension --install weewx-netatmo.zip
 
-2) select and configure the driver:
+3) select and configure the driver:
 
 sudo wee_config --reconfigure
 
-3) start weewx:
+4) start weewx:
 
 sudo /etc/init.d/weewx start