Skip to content
Snippets Groups Projects
Commit c4c28028 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'bob-devel-update' into 'master'

[bob-devel] update all dependencies, remove dlib, menpo, menpofit

Closes #69

See merge request bob/bob.conda!409
parents 1ffc06f4 b2e4c8b5
No related branches found
No related tags found
1 merge request!409[bob-devel] update all dependencies, remove dlib, menpo, menpofit
Pipeline #29297 passed
...@@ -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: 2019.03.07 version: 2019.04.16
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 2019.03.07 - bob-devel 2019.04.16
- docker-py 3.6.0 - docker-py 3.6.0
- flask 1.0.2 - flask 1.0.2
- flask-cors 3.0.7 - flask-cors 3.0.7
...@@ -28,7 +28,6 @@ requirements: ...@@ -28,7 +28,6 @@ requirements:
- simplejson 3.16.0 - simplejson 3.16.0
- sphinxcontrib-programoutput 0.11 - sphinxcontrib-programoutput 0.11
- sphinxcontrib-httpdomain 1.7.0 - sphinxcontrib-httpdomain 1.7.0
- termcolor 1.1.0
- psycopg2 2.7.6.1 - psycopg2 2.7.6.1
run: run:
- python - python
......
# A copy of this list is in beat-devel as well. Keep them synced please. # A copy of this list is in beat-devel and bob/bob as well. Keep them synced please.
{% 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: 2019.03.07 version: 2019.04.16
# 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.
...@@ -22,60 +22,59 @@ requirements: ...@@ -22,60 +22,59 @@ requirements:
# update all dependencies at once (to their latest version) each time you # update all dependencies at once (to their latest version) each time you
# modify the dependencies here. Use ``conda search`` to find the latest # modify the dependencies here. Use ``conda search`` to find the latest
# version of packages. # version of packages.
- boost 1.65.1 - boost 1.67.0
- caffe 1.0 # [linux] - caffe 1.0 # [linux]
- click 7.0 - click 7.0
- click-plugins 1.0.4 - click-plugins 1.0.4
- cmake 3.12.2 - cmake 3.14.0
- coverage 4.5.1 - coverage 4.5.3
- cyvlfeat 0.4.6 - cyvlfeat 0.4.6
- dlib 19.7
- docopt 0.6.2 - docopt 0.6.2
- ffmpeg 3.4 - ffmpeg 4.0
- freetype 2.9.1 - freetype 2.9.1
- giflib 5.1.4 - giflib 5.1.4
- hdf5 1.10.1 - hdf5 1.10.2
- jinja2 2.10 - jinja2 2.10.1
- jpeg 9b - jpeg 9b
- kaldi 2017.03.13 # [linux] - kaldi 2017.03.13 # [linux]
- libblitz 1.0.1 - libblitz 1.0.1
- libmatio 1.5.11 - libmatio 1.5.15
- libogg 1.3.2 - libogg 1.3.2
- libpng 1.6.35 - libpng 1.6.36
- libsvm 3.22 - libsvm 3.22
- libtiff 4.0.9 - libtiff 4.0.10
- madmom 0.15.1 - madmom 0.15.1
- matplotlib 2.2.3 - matplotlib 3.0.3
- menpo 0.8.1 - mkl 2019.3
- menpofit 0.5.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
- numpy 1.15.1 - numpy 1.16.2
- opencv 3.3.1 - opencv 3.4.2
- pillow 5.2.0 - pillow 5.4.1
- pkg-config 0.29.2 - pkg-config 0.29.2
- pyedflib 0.1.11 - pyedflib 0.1.11
- pytorch 0.4.1 # [linux] - pytorch 1.0.1 # [linux]
- pyyaml 3.13 - pyyaml 5.1
- requests 2.19.1 - requests 2.21.0
- schema 0.6.8 - schema 0.6.8
- scikit-image 0.14.0 - scikit-image 0.14.2
- scikit-learn 0.19.2 - scikit-learn 0.20.3
- scipy 1.1.0 - scipy 1.2.1
- setuptools 40.2.0 - setuptools 41.0.0
- six 1.11.0 - six 1.12.0
- sox 14.4.2 - sox 14.4.2
- sphinx 1.8.1 - sphinx 1.8.5
- sphinx_rtd_theme 0.4.1 - sphinx_rtd_theme 0.4.3
- sqlalchemy 1.2.11 - sqlalchemy 1.3.1
- tabulate 0.8.2 - tabulate 0.8.3
- tensorflow 1.9.0 - tensorflow 1.13.1
- torchvision 0.2.1 # [linux] - torchvision 0.2.1 # [linux]
- vlfeat 0.9.21 - vlfeat 0.9.21
- zc.buildout 2.12.2 - zc.buildout 2.12.2
- zc.recipe.egg 2.0.7 - zc.recipe.egg 2.0.7
# beat-devel direct dependencies that leak to bob-devel as indirect dependencies:
- termcolor 1.1.0
run: run:
- python - python
run_constrained: run_constrained:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment