Merge branch 'add_opencv_bob-devel' into 'master'

Add opencv package to bob-devel and bump versions

See merge request !460

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

conda/bob-devel/meta.yaml

@@ -4,7 +4,9 @@ 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
+  # Then open an MR in bob/bob.devtools to put these new versions of bob-devel and
+  # beat-devel in `bob/devtools/data/conda_build_config.yaml`
+  version: 2020.11.19
 
 build:
   # the build number must be zero all the time.
@@ -23,6 +25,11 @@ requirements:
     # IMPORTANT: To update this list, create a conda environment with all the
     # below packages without any pinning. Once the environment is resolved,
     # observe those versions and put them here.
+    # Example:
+    # $ conda create -n temp --dry-run \
+    # --override-channels --strict-channel-priority \
+    # -c https://www.idiap.ch/software/bob/conda -c defaults \
+    # python=3.7 boost click click-plugins ...
     - boost 1.73.0
     - click 7.1.2
     - click-plugins 1.1.1
@@ -52,12 +59,13 @@ 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
     - psycopg2 2.8.5
     - pybind11 2.5.0
-    - pyopengl 3.1.1
+    - pyopengl 3.1.1a1
     - pyqtgraph 0.11.0
     - pytest 6.1.1
     - pytest-cov 2.10.1

conda/opencv/meta.yaml

@@ -75,11 +75,10 @@ requirements:
     - nomkl                          # [blas_impl == 'openblas']
     - hdf5 {{ hdf5 }}                # [unix]
     - eigen 3.3.*
-    - jasper
+    - jasper {{ jasper }}
     - zlib {{ zlib }}
     - jpeg {{ jpeg }}
     - libtiff {{ libtiff }}
-    - libwebp {{ libwebp }}
     - harfbuzz {{ harfbuzz }}        # [unix]
     - libpng {{ libpng }}
     - ffmpeg {{ ffmpeg }}            # [not win]
@@ -87,15 +86,11 @@ requirements:
     - freetype {{ freetype }}
     - glib {{ glib }}                # [unix]
   run:
-    - {{ pin_compatible('harfbuzz') }} # [unix]
     # Don't depend on python in the run section
     # py-opencv will depend on python
-    - qt 5.9.*                       # [not osx and not aarch64 and not ppc64le]
-    # https://github.com/conda-forge/opencv-feedstock/issues/174
-    # Seems like the OSX ABI has changed between 2.9 and 2.10???
-    # That or a dependency wasn't merged in
-    # Since we don't know the cause, we are choosing this pinning on all platforms.
-    - {{ pin_compatible('freetype', min_pin='x.x') }}
+
+    - {{ pin_compatible('harfbuzz') }} # [unix]
+
 
 test:
     requires:

conda_build_config.yaml

@@ -70,28 +70,28 @@ zip_keys:
 
 # The dependencies that we link against (host requirements).
 ffmpeg:
-  - 4.2
+  - 4.2.2
 freetype:
-  - 2.10
+  - 2.10.4
 glib:
-  - 2
+  - 2.63.1
 harfbuzz:
-  - 2.4
+  - 1.8.8
 hdf5:
   - 1.10.6
+jasper:
+  - 2.0.14
 jpeg:
-  - 9
+  - 9b
 libpng:
-  - 1.6
+  - 1.6.37
 libtiff:
-  - 4.1
-libwebp:
-  - 1.0.0
+  - 4.1.0
 mkl:
-  - 2019
+  - 2019.4
 numpy:
   - 1.16
 xz:
-  - 5
+  - 5.2.5
 zlib:
-  - 1.2
+  - 1.2.11