From 403a721e911c4eb93a2017b7152eff378556f3d6 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 3 May 2017 21:08:21 +0300 Subject: [PATCH] Comment out opencv-python that is not installable on arm (#7426) * Comment out opencv-python that is not installable on arm * Disable import-error --- homeassistant/components/opencv.py | 6 +++--- requirements_all.txt | 2 +- script/gen_requirements_all.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/opencv.py b/homeassistant/components/opencv.py index 7578398ccb7..634e8e156a1 100644 --- a/homeassistant/components/opencv.py +++ b/homeassistant/components/opencv.py @@ -88,7 +88,7 @@ CONFIG_SCHEMA = vol.Schema({ def cv_image_to_bytes(cv_image): """Convert OpenCV image to bytes.""" - import cv2 + import cv2 # pylint: disable=import-error # pylint: disable=no-member encode_param = [int(cv2.IMWRITE_JPEG_QUALITY), 90] @@ -103,7 +103,7 @@ def cv_image_to_bytes(cv_image): def cv_image_from_bytes(image): """Convert image bytes to OpenCV image.""" - import cv2 + import cv2 # pylint: disable=import-error import numpy # pylint: disable=no-member @@ -112,7 +112,7 @@ def cv_image_from_bytes(image): def process_image(image, classifier_group, is_camera): """Process the image given a classifier group.""" - import cv2 + import cv2 # pylint: disable=import-error import numpy # pylint: disable=no-member diff --git a/requirements_all.txt b/requirements_all.txt index 1bf94e548c8..358db1d3802 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -418,7 +418,7 @@ oauth2client==4.0.0 oemthermostat==1.1 # homeassistant.components.opencv -opencv-python==3.2.0.6 +# opencv-python==3.2.0.6 # homeassistant.components.sensor.openevse openevsewifi==0.4 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 94635a58525..1ac18ea0705 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -15,6 +15,7 @@ COMMENT_REQUIREMENTS = ( 'pybluez', 'beacontools', 'bluepy', + 'opencv-python', 'python-lirc', 'gattlib', 'pyuserinput',