Commit 470d97e0 authored by André Anjos's avatar André Anjos 💬
Browse files

Merge branch 'issue-62' into 'master'

Update beat-devel following discussions at…

Closes #62

See merge request bob/bob.conda!389
parents 29523f30 87dc4294
Pipeline #25636 passed with stage
in 15 minutes and 29 seconds
......@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package:
name: beat-devel
version: 2018.12.15
version: 2018.12.25
build:
# the build number must be zero all the time.
......@@ -15,7 +15,7 @@ build:
requirements:
host:
- python {{ python }}
- bob-devel 2018.12.11
- bob-devel 2018.12.25
- docker-py 3.6.0
- flask 1.0.2
- flask-cors 3.0.7
......@@ -29,8 +29,7 @@ requirements:
- sphinxcontrib-programoutput 0.11
- sphinxcontrib-httpdomain 1.7.0
- termcolor 1.1.0
- psycopg2 2.7.5 # [linux]
- psycopg2 2.6.2 # [osx]
- psycopg2 2.7.6.1
run:
- python
run_constrained:
......
......@@ -2,7 +2,7 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package:
name: bob-devel
version: 2018.12.11
version: 2018.12.25
# please update the version of beat-devel and update bob-devel's version there
# as well in the same merge request.
......@@ -41,7 +41,7 @@ requirements:
- libblitz 1.0.1
- libmatio 1.5.11
- libogg 1.3.2
- libpng 1.6.34
- libpng 1.6.35
- libsvm 3.22
- libtiff 4.0.9
- madmom 0.15.1
......
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