Skip to content
Snippets Groups Projects
Commit 97415615 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Fix bob-devel conflicts

parent 0aeb61b2
Branches
Tags
1 merge request!246Enable bob-devel builds
Pipeline #54472 failed
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment