Commit 42dd6eeb authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Merge branch 'bob-devel' into 'master'

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

See merge request !453
parents 3d3d7c5a fd8240b3
Pipeline #45192 passed with stage
in 17 minutes and 2 seconds
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %} {% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package: package:
name: beat-devel name: beat-devel
version: 2020.11.06 version: 2020.11.10
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -14,7 +14,7 @@ build: ...@@ -14,7 +14,7 @@ build:
requirements: requirements:
host: host:
- bob-devel 2020.11.06 - bob-devel 2020.11.10
- python {{ python }} - python {{ python }}
# the dependencies are pinned in bob-devel # the dependencies are pinned in bob-devel
- docker-py - docker-py
......
...@@ -4,7 +4,7 @@ package: ...@@ -4,7 +4,7 @@ package:
name: bob-devel name: bob-devel
# please update the version of beat-devel and update bob-devel's version # please update the version of beat-devel and update bob-devel's version
# there as well in the same merge request. # there as well in the same merge request.
version: 2020.11.06 version: 2020.11.10
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -48,7 +48,7 @@ requirements: ...@@ -48,7 +48,7 @@ requirements:
- libtiff 4.1.0 - libtiff 4.1.0
- make 4.2.1 - make 4.2.1
- matplotlib 3.3.2 - matplotlib 3.3.2
- mkl 2020.2 # [linux] - mkl 2019.4
- ncurses 6.2 - ncurses 6.2
- nose 1.3.7 - nose 1.3.7
- numpy 1.19.2 - numpy 1.19.2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment