Commit 11f85a1f authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'kaldi' into 'master'

[kaldi] drop epoch number

See merge request bob/bob.conda!448
parents 059bd786 d206b963
Pipeline #41935 passed with stage
in 45 minutes and 4 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.06.15 version: 2020.08.12
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.06.15 - bob-devel 2020.08.12
- python {{ python }} - python {{ python }}
- docker-py 4.2.0 - docker-py 4.2.0
- jsonschema 3.2.0 - jsonschema 3.2.0
......
...@@ -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.06.15 version: 2020.08.12
build: build:
# the build number must be zero all the time. # the build number must be zero all the time.
...@@ -40,7 +40,7 @@ requirements: ...@@ -40,7 +40,7 @@ requirements:
- hdf5 1.10.2 - hdf5 1.10.2
- jinja2 2.11.1 - jinja2 2.11.1
- jpeg 9b - jpeg 9b
- kaldi 1!5.5.164 # [linux] - kaldi 5.5.164 # [linux]
- libblitz 1.0.1 - libblitz 1.0.1
- libmatio 1.5.17 - libmatio 1.5.17
- libogg 1.3.2 - libogg 1.3.2
......
{% set name = "kaldi" %} {% set name = "kaldi" %}
{% set version = "1!5.5.164" %} {% set version = "5.5.164" %}
{% set git_rev = "ca32c4e2bd77544c4ad4aa0bba25f0b812ea1a61" %} {% set git_rev = "ca32c4e2bd77544c4ad4aa0bba25f0b812ea1a61" %}
package: package:
...@@ -13,7 +13,7 @@ source: ...@@ -13,7 +13,7 @@ source:
- conda-kaldi.patch - conda-kaldi.patch
build: build:
number: 1 number: 0
skip: True # [not linux] skip: True # [not linux]
run_exports: run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }} - {{ pin_subpackage(name, max_pin='x.x') }}
......
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