Fix bob-devel conflicts

97415615 · Amir MOHAMMADI · 0aeb61b2 · 97415615
Commit 97415615 authored 3 years ago by Amir MOHAMMADI
--- 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.5
-  - 1.19   # [osx and arm64]
 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