Commit 33d61ad0 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'bob-devel' into 'master'

[bob-devel,beat-devel] downgrade mkl for compatibility

See merge request bob/bob.conda!384
parents 0c0eb8b7 a59b3b64
Pipeline #25007 passed with stage
in 13 minutes and 46 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: 2018.10.16 version: 2018.11.23
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -15,7 +15,7 @@ build: ...@@ -15,7 +15,7 @@ build:
requirements: requirements:
host: host:
- python {{ python }} - python {{ python }}
- bob-devel 2018.10.16 - bob-devel 2018.11.23
- docker-py 3.2.1 - docker-py 3.2.1
- flask 0.12.2 - flask 0.12.2
- flask-cors 3.0.3 - flask-cors 3.0.3
......
...@@ -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: bob-devel name: bob-devel
version: 2018.10.16 version: 2018.11.23
# please update the version of beat-devel and update bob-devel's version there # please update the version of beat-devel and update bob-devel's version there
# as well in the same merge request. # as well in the same merge request.
...@@ -48,7 +48,7 @@ requirements: ...@@ -48,7 +48,7 @@ requirements:
- matplotlib 2.2.3 - matplotlib 2.2.3
- menpo 0.8.1 - menpo 0.8.1
- menpofit 0.5.0 - menpofit 0.5.0
- mkl 2019.0 - mkl 2018.0.3
- mne 0.15.2 - mne 0.15.2
- mr.developer 1.38 - mr.developer 1.38
- nose 1.3.7 - nose 1.3.7
......
Supports Markdown
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