From 1a087a6f36e7eed8987e8d7c68ace00beff9b3e6 Mon Sep 17 00:00:00 2001
From: Vincent <vincent.pollet@idiap.ch>
Date: Wed, 18 Nov 2020 17:52:40 +0100
Subject: [PATCH] Add opencv package to bob-devel and bump versions
---
conda/beat-devel/meta.yaml | 4 ++--
conda/bob-devel/meta.yaml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/conda/beat-devel/meta.yaml b/conda/beat-devel/meta.yaml
index 64c5ecc9..bf8111a2 100644
--- a/conda/beat-devel/meta.yaml
+++ b/conda/beat-devel/meta.yaml
@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package:
name: beat-devel
- version: 2020.11.18
+ version: 2020.11.19
build:
# the build number must be zero all the time.
@@ -14,7 +14,7 @@ build:
requirements:
host:
- - bob-devel 2020.11.18
+ - bob-devel 2020.11.19
- python {{ python }}
# the dependencies are pinned in bob-devel
- docker-py
diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index b65590a8..ef0a9f22 100644
--- a/conda/bob-devel/meta.yaml
+++ b/conda/bob-devel/meta.yaml
@@ -4,7 +4,7 @@ package:
name: bob-devel
# please update the version of beat-devel and update bob-devel's version
# there as well in the same merge request.
- version: 2020.11.18
+ version: 2020.11.19
build:
# the build number must be zero all the time.
@@ -52,6 +52,7 @@ requirements:
- ncurses 6.2
- nose 1.3.7
- numpy 1.19.2
+ - opencv 4.5.0
- pandas 1.1.3
- pillow 8.0.1
- pkg-config 0.29.2
--
GitLab