evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade numpy to 1.15.4 (#18506)

Browse source
This commit is contained in:
Fabian Affolter 2018-11-16 14:14:40 +01:00 • committed by Pascal Vizeli
parent 9f51deb1de
commit 30806fa362
6 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/binary_sensor/trend.py
View file

@ -22,7 +22,7 @@ from homeassistant.helpers.entity import generate_entity_id
from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.event import async_track_state_change
from homeassistant.util import utcnow from homeassistant.util import utcnow
REQUIREMENTS = ['numpy==1.15.3'] REQUIREMENTS = ['numpy==1.15.4']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

2
homeassistant/components/image_processing/opencv.py
View file

@ -16,7 +16,7 @@ from homeassistant.components.image_processing import (
from homeassistant.core import split_entity_id from homeassistant.core import split_entity_id
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['numpy==1.15.3'] REQUIREMENTS = ['numpy==1.15.4']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

59
homeassistant/components/image_processing/tensorflow.py
View file

@ -1,5 +1,5 @@
""" """
Component that performs TensorFlow classification on images. Support for performing TensorFlow classification on images.
For a quick start, pick a pre-trained COCO model from: For a quick start, pick a pre-trained COCO model from:
https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/detection_model_zoo.md https://github.com/tensorflow/models/blob/master/research/object_detection/g3doc/detection_model_zoo.md
@ -8,8 +8,8 @@ For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/image_processing.tensorflow/ https://home-assistant.io/components/image_processing.tensorflow/
""" """
import logging import logging
import sys
import os import os
import sys
import voluptuous as vol import voluptuous as vol
@ -20,7 +20,7 @@ from homeassistant.core import split_entity_id
from homeassistant.helpers import template from homeassistant.helpers import template
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['numpy==1.15.3', 'pillow==5.2.0', 'protobuf==3.6.1'] REQUIREMENTS = ['numpy==1.15.4', 'pillow==5.2.0', 'protobuf==3.6.1']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -28,29 +28,29 @@ ATTR_MATCHES = 'matches'
ATTR_SUMMARY = 'summary' ATTR_SUMMARY = 'summary'
ATTR_TOTAL_MATCHES = 'total_matches' ATTR_TOTAL_MATCHES = 'total_matches'
CONF_FILE_OUT = 'file_out' CONF_AREA = 'area'
CONF_MODEL = 'model' CONF_BOTTOM = 'bottom'
CONF_GRAPH = 'graph'
CONF_LABELS = 'labels'
CONF_MODEL_DIR = 'model_dir'
CONF_CATEGORIES = 'categories' CONF_CATEGORIES = 'categories'
CONF_CATEGORY = 'category' CONF_CATEGORY = 'category'
CONF_AREA = 'area' CONF_FILE_OUT = 'file_out'
CONF_TOP = 'top' CONF_GRAPH = 'graph'
CONF_LABELS = 'labels'
CONF_LEFT = 'left' CONF_LEFT = 'left'
CONF_BOTTOM = 'bottom' CONF_MODEL = 'model'
CONF_MODEL_DIR = 'model_dir'
CONF_RIGHT = 'right' CONF_RIGHT = 'right'
CONF_TOP = 'top'
AREA_SCHEMA = vol.Schema({ AREA_SCHEMA = vol.Schema({
vol.Optional(CONF_TOP, default=0): cv.small_float,
vol.Optional(CONF_LEFT, default=0): cv.small_float,
vol.Optional(CONF_BOTTOM, default=1): cv.small_float, vol.Optional(CONF_BOTTOM, default=1): cv.small_float,
vol.Optional(CONF_RIGHT, default=1): cv.small_float vol.Optional(CONF_LEFT, default=0): cv.small_float,
vol.Optional(CONF_RIGHT, default=1): cv.small_float,
vol.Optional(CONF_TOP, default=0): cv.small_float,
}) })
CATEGORY_SCHEMA = vol.Schema({ CATEGORY_SCHEMA = vol.Schema({
vol.Required(CONF_CATEGORY): cv.string, vol.Required(CONF_CATEGORY): cv.string,
vol.Optional(CONF_AREA): AREA_SCHEMA vol.Optional(CONF_AREA): AREA_SCHEMA,
}) })
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@ -58,14 +58,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.All(cv.ensure_list, [cv.template]), vol.All(cv.ensure_list, [cv.template]),
vol.Required(CONF_MODEL): vol.Schema({ vol.Required(CONF_MODEL): vol.Schema({
vol.Required(CONF_GRAPH): cv.isfile, vol.Required(CONF_GRAPH): cv.isfile,
vol.Optional(CONF_LABELS): cv.isfile,
vol.Optional(CONF_MODEL_DIR): cv.isdir,
vol.Optional(CONF_AREA): AREA_SCHEMA, vol.Optional(CONF_AREA): AREA_SCHEMA,
vol.Optional(CONF_CATEGORIES, default=[]): vol.Optional(CONF_CATEGORIES, default=[]):
vol.All(cv.ensure_list, [vol.Any( vol.All(cv.ensure_list, [vol.Any(cv.string, CATEGORY_SCHEMA)]),
cv.string, vol.Optional(CONF_LABELS): cv.isfile,
CATEGORY_SCHEMA vol.Optional(CONF_MODEL_DIR): cv.isdir,
)])
}) })
}) })
@ -93,7 +90,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
# Make sure locations exist # Make sure locations exist
if not os.path.isdir(model_dir) or not os.path.exists(labels): if not os.path.isdir(model_dir) or not os.path.exists(labels):
_LOGGER.error("Unable to locate tensorflow models or label map.") _LOGGER.error("Unable to locate tensorflow models or label map")
return return
# append custom model path to sys.path # append custom model path to sys.path
@ -118,9 +115,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
# pylint: disable=unused-import,unused-variable # pylint: disable=unused-import,unused-variable
import cv2 # noqa import cv2 # noqa
except ImportError: except ImportError:
_LOGGER.warning("No OpenCV library found. " _LOGGER.warning(
"TensorFlow will process image with " "No OpenCV library found. TensorFlow will process image with "
"PIL at reduced resolution.") "PIL at reduced resolution")
# setup tensorflow graph, session, and label map to pass to processor # setup tensorflow graph, session, and label map to pass to processor
# pylint: disable=no-member # pylint: disable=no-member
@ -241,23 +238,23 @@ class TensorFlowImageProcessor(ImageProcessingEntity):
# Draw custom global region/area # Draw custom global region/area
if self._area != [0, 0, 1, 1]: if self._area != [0, 0, 1, 1]:
draw_box(draw, self._area, draw_box(draw, self._area,
img_width, img_height, img_width, img_height, "Detection Area", (0, 255, 255))
"Detection Area", (0, 255, 255))
for category, values in matches.items(): for category, values in matches.items():
# Draw custom category regions/areas # Draw custom category regions/areas
if (category in self._category_areas if (category in self._category_areas
and self._category_areas[category] != [0, 0, 1, 1]): and self._category_areas[category] != [0, 0, 1, 1]):
label = "{} Detection Area".format(category.capitalize()) label = "{} Detection Area".format(category.capitalize())
draw_box(draw, self._category_areas[category], img_width, draw_box(
draw, self._category_areas[category], img_width,
img_height, label, (0, 255, 0)) img_height, label, (0, 255, 0))
# Draw detected objects # Draw detected objects
for instance in values: for instance in values:
label = "{0} {1:.1f}%".format(category, instance['score']) label = "{0} {1:.1f}%".format(category, instance['score'])
draw_box(draw, instance['box'], draw_box(
img_width, img_height, draw, instance['box'], img_width, img_height, label,
label, (255, 255, 0)) (255, 255, 0))
for path in paths: for path in paths:
_LOGGER.info("Saving results image to %s", path) _LOGGER.info("Saving results image to %s", path)

11
homeassistant/components/sensor/pollen.py
View file

@ -4,21 +4,22 @@ Support for Pollen.com allergen and cold/flu sensors.
For more details about this platform, please refer to the documentation at For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/sensor.pollen/ https://home-assistant.io/components/sensor.pollen/
""" """
import logging
from datetime import timedelta from datetime import timedelta
import logging
from statistics import mean from statistics import mean
import voluptuous as vol import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import ( from homeassistant.const import (
ATTR_ATTRIBUTION, ATTR_STATE, CONF_MONITORED_CONDITIONS) ATTR_ATTRIBUTION, ATTR_STATE, CONF_MONITORED_CONDITIONS)
from homeassistant.helpers import aiohttp_client from homeassistant.helpers import aiohttp_client
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle from homeassistant.util import Throttle
REQUIREMENTS = ['numpy==1.15.3', 'pypollencom==2.2.2'] REQUIREMENTS = ['numpy==1.15.4', 'pypollencom==2.2.2']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ATTR_ALLERGEN_AMOUNT = 'allergen_amount' ATTR_ALLERGEN_AMOUNT = 'allergen_amount'
@ -401,8 +402,8 @@ class PollenComData:
await self._get_data( await self._get_data(
self._client.disease.extended, TYPE_DISEASE_FORECAST) self._client.disease.extended, TYPE_DISEASE_FORECAST)
_LOGGER.debug('New data retrieved: %s', self.data) _LOGGER.debug("New data retrieved: %s", self.data)
except InvalidZipError: except InvalidZipError:
_LOGGER.error( _LOGGER.error(
'Cannot retrieve data for ZIP code: %s', self._client.zip_code) "Cannot retrieve data for ZIP code: %s", self._client.zip_code)
self.data = {} self.data = {}

2
requirements_all.txt
View file

@ -686,7 +686,7 @@ nuheat==0.3.0
# homeassistant.components.image_processing.opencv # homeassistant.components.image_processing.opencv
# homeassistant.components.image_processing.tensorflow # homeassistant.components.image_processing.tensorflow
# homeassistant.components.sensor.pollen # homeassistant.components.sensor.pollen
numpy==1.15.3 numpy==1.15.4
# homeassistant.components.google # homeassistant.components.google
oauth2client==4.0.0 oauth2client==4.0.0

2
requirements_test_all.txt
View file

@ -123,7 +123,7 @@ mficlient==0.3.0
# homeassistant.components.image_processing.opencv # homeassistant.components.image_processing.opencv
# homeassistant.components.image_processing.tensorflow # homeassistant.components.image_processing.tensorflow
# homeassistant.components.sensor.pollen # homeassistant.components.sensor.pollen
numpy==1.15.3 numpy==1.15.4
# homeassistant.components.mqtt # homeassistant.components.mqtt
# homeassistant.components.shiftr # homeassistant.components.shiftr