From 95c7ae5c612759cc3ae2c6745a2d22362f0f732a Mon Sep 17 00:00:00 2001
From: Olegs NIKISINS <onikisins@italix03.idiap.ch>
Date: Wed, 16 Jan 2019 16:54:31 +0100
Subject: [PATCH] Changed the meta.yml, relocated opencv
---
conda/meta.yaml | 4 ++--
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 15ea77a3..22b7b06e 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -36,14 +36,14 @@ requirements:
- bob.ip.dlib
- bob.ip.facelandmarks
- bob.rppg.base >=2.0.0
+ - scikit-image
+ - opencv
run:
- python
- setuptools
- six
- numpy >=1.11
- scikit-learn
- - scikit-image
- - opencv
test:
imports:
diff --git a/requirements.txt b/requirements.txt
index cb6825de..ce5d6304 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,5 +18,5 @@ bob.learn.linear
scikit-learn
bob.rppg.base >= 2.0.0
scikit-image
-opencv-python
+opencv
--
GitLab