From 987e47ee26241d1d372a6a5fa46d878af37e1936 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 20 Aug 2020 08:22:20 +0200
Subject: [PATCH] [python] Move dlib to the bottom of the stack
---
conda/beat-devel/meta.yaml | 4 ++--
conda/bob-devel/meta.yaml | 4 ++--
python.txt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/conda/beat-devel/meta.yaml b/conda/beat-devel/meta.yaml
index 94a0501f..b8742351 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.08.12
+ version: 2020.08.20
build:
# the build number must be zero all the time.
@@ -14,7 +14,7 @@ build:
requirements:
host:
- - bob-devel 2020.08.12
+ - bob-devel 2020.08.20
- python {{ python }}
- docker-py 4.2.0
- jsonschema 3.2.0
diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index 3e0818ab..a5159ded 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.08.12
+ version: 2020.08.20
build:
# the build number must be zero all the time.
@@ -23,7 +23,7 @@ requirements:
# Dependency list of bob packages. Everything is pinned to allow for better
# reproducibility.
- - boost 1.67.0
+ - boost 1.71.0
- caffe 1.0 # [linux]
- click 7.1.1
- click-plugins 1.1.1
diff --git a/python.txt b/python.txt
index 988a0c48..f5045fa7 100644
--- a/python.txt
+++ b/python.txt
@@ -1,4 +1,3 @@
-conda/dlib
conda/cyvlfeat
conda/menpo
conda/menpofit
@@ -20,5 +19,6 @@ conda/nodeenv
conda/pre-commit
conda/pytest-qt
conda/ddt
+conda/dlib
conda/bob-devel
conda/beat-devel
--
GitLab