Merge branch 'bob-devel' into 'master'

[bob-devel] downgrade mkl to prevent conflicts in mac builds

See merge request !453

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.06
+  version: 2020.11.10
 
 build:
   # the build number must be zero all the time.
@@ -14,7 +14,7 @@ build:
 
 requirements:
   host:
-    - bob-devel 2020.11.06
+    - bob-devel 2020.11.10
     - python {{ python }}
     # the dependencies are pinned in bob-devel
     - docker-py

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.11.06
+  version: 2020.11.10
 
 build:
   # the build number must be zero all the time.
@@ -48,7 +48,7 @@ requirements:
     - libtiff 4.1.0
     - make 4.2.1
     - matplotlib 3.3.2
-    - mkl 2020.2  # [linux]
+    - mkl 2019.4
     - ncurses 6.2
     - nose 1.3.7
     - numpy 1.19.2