netatmo api is now in pip as pyatmo (#14824)

Signed-off-by: Hugo D. (jabesq) <jabesq@gmail.com>
This commit is contained in:
Hugo Dupras 2018-06-05 17:55:53 +02:00 committed by Paulus Schoutsen
parent b3b4f7468d
commit 640e499964
6 changed files with 20 additions and 22 deletions

View file

@ -68,12 +68,12 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
module_name = None
import lnetatmo
import pyatmo
try:
data = CameraData(netatmo.NETATMO_AUTH, home)
if not data.get_camera_names():
return None
except lnetatmo.NoDevice:
except pyatmo.NoDevice:
return None
welcome_sensors = config.get(

View file

@ -35,7 +35,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
netatmo = hass.components.netatmo
home = config.get(CONF_HOME)
verify_ssl = config.get(CONF_VERIFY_SSL, True)
import lnetatmo
import pyatmo
try:
data = CameraData(netatmo.NETATMO_AUTH, home)
for camera_name in data.get_camera_names():
@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
continue
add_devices([NetatmoCamera(data, camera_name, home,
camera_type, verify_ssl)])
except lnetatmo.NoDevice:
except pyatmo.NoDevice:
return None

View file

@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
netatmo = hass.components.netatmo
device = config.get(CONF_RELAY)
import lnetatmo
import pyatmo
try:
data = ThermostatData(netatmo.NETATMO_AUTH, device)
for module_name in data.get_module_names():
@ -53,7 +53,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
module_name not in config[CONF_THERMOSTAT]:
continue
add_devices([NetatmoThermostat(data, module_name)], True)
except lnetatmo.NoDevice:
except pyatmo.NoDevice:
return None
@ -168,8 +168,8 @@ class ThermostatData(object):
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
"""Call the NetAtmo API to update the data."""
import lnetatmo
self.thermostatdata = lnetatmo.ThermostatData(self.auth)
import pyatmo
self.thermostatdata = pyatmo.ThermostatData(self.auth)
self.target_temperature = self.thermostatdata.setpoint_temp
self.setpoint_mode = self.thermostatdata.setpoint_mode
self.current_temperature = self.thermostatdata.temp

View file

@ -16,9 +16,7 @@ from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv
from homeassistant.util import Throttle
REQUIREMENTS = [
'https://github.com/jabesq/netatmo-api-python/archive/'
'v0.9.2.1.zip#lnetatmo==0.9.2.1']
REQUIREMENTS = ['pyatmo==1.0.0']
_LOGGER = logging.getLogger(__name__)
@ -45,11 +43,11 @@ CONFIG_SCHEMA = vol.Schema({
def setup(hass, config):
"""Set up the Netatmo devices."""
import lnetatmo
import pyatmo
global NETATMO_AUTH
try:
NETATMO_AUTH = lnetatmo.ClientAuth(
NETATMO_AUTH = pyatmo.ClientAuth(
config[DOMAIN][CONF_API_KEY], config[DOMAIN][CONF_SECRET_KEY],
config[DOMAIN][CONF_USERNAME], config[DOMAIN][CONF_PASSWORD],
'read_station read_camera access_camera '
@ -111,8 +109,8 @@ class CameraData(object):
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
"""Call the Netatmo API to update the data."""
import lnetatmo
self.camera_data = lnetatmo.CameraData(self.auth, size=100)
import pyatmo
self.camera_data = pyatmo.CameraData(self.auth, size=100)
@Throttle(MIN_TIME_BETWEEN_EVENT_UPDATES)
def update_event(self):

View file

@ -70,7 +70,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
data = NetAtmoData(netatmo.NETATMO_AUTH, config.get(CONF_STATION, None))
dev = []
import lnetatmo
import pyatmo
try:
if CONF_MODULES in config:
# Iterate each module
@ -92,7 +92,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
else:
_LOGGER.warning("Ignoring unknown var %s for mod %s",
variable, module_name)
except lnetatmo.NoDevice:
except pyatmo.NoDevice:
return None
add_devices(dev, True)
@ -305,8 +305,8 @@ class NetAtmoData(object):
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
"""Call the Netatmo API to update the data."""
import lnetatmo
self.station_data = lnetatmo.WeatherStationData(self.auth)
import pyatmo
self.station_data = pyatmo.WeatherStationData(self.auth)
if self.station is not None:
self.data = self.station_data.lastData(

View file

@ -412,9 +412,6 @@ https://github.com/aparraga/braviarc/archive/0.3.7.zip#braviarc==0.3.7
# homeassistant.components.media_player.spotify
https://github.com/happyleavesaoc/spotipy/archive/544614f4b1d508201d363e84e871f86c90aa26b2.zip#spotipy==2.4.4
# homeassistant.components.netatmo
https://github.com/jabesq/netatmo-api-python/archive/v0.9.2.1.zip#lnetatmo==0.9.2.1
# homeassistant.components.neato
https://github.com/jabesq/pybotvac/archive/v0.0.5.zip#pybotvac==0.0.5
@ -733,6 +730,9 @@ pyasn1-modules==0.1.5
# homeassistant.components.notify.xmpp
pyasn1==0.3.7
# homeassistant.components.netatmo
pyatmo==1.0.0
# homeassistant.components.apple_tv
pyatv==0.3.10