From 974156156e7e43c2aebf32d8ebbc34248a0f9111 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 30 Sep 2021 23:34:33 +0200
Subject: [PATCH] Fix bob-devel conflicts

---
 bob/devtools/data/conda_build_config.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml
index 35540830..8db59bfb 100644
--- a/bob/devtools/data/conda_build_config.yaml
+++ b/bob/devtools/data/conda_build_config.yaml
@@ -376,8 +376,7 @@ numba:
 # we build against numpy 1.18 but test against newer versions.
 numpy:
   # part of a zip_keys: python, python_impl, numpy
-  - 1.18   # [not (osx and arm64)]
-  - 1.19   # [osx and arm64]
+  - 1.19.5
 opencv:
   - 4.5.2
 pandas:
@@ -425,7 +424,7 @@ scikit_learn:
 scipy:
   - 1.7.1
 setuptools:
-  - 58.0.4
+  - 49.6.0
 simplejson:
   - 3.17.5
 six:
@@ -458,5 +457,9 @@ vlfeat:
   - 0.9.20
 xarray:
   - 0.19.0
+zc_buildout:
+  - 2.13.4
+zc_recipe_egg:
+  - 2.0.7
 
 # AUTOMATIC PARSING END
-- 
GitLab