From 85580fe772c4cd649386180532e79ee48047f89c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Wed, 7 Aug 2019 16:12:05 +0200
Subject: [PATCH] [beat/bob-devel] Updates to base software stack (closes #57)
---
conda/beat-devel/meta.yaml | 2 +-
conda/bob-devel/meta.yaml | 29 +++++++++++++++--------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/conda/beat-devel/meta.yaml b/conda/beat-devel/meta.yaml
index 28c365f2..5ce5882e 100644
--- a/conda/beat-devel/meta.yaml
+++ b/conda/beat-devel/meta.yaml
@@ -26,7 +26,7 @@ requirements:
- python-graphviz 0.8.4
- pyzmq 17.1.2
- simplejson 3.16.0
- - sphinxcontrib-programoutput 0.11
+ - sphinxcontrib-programoutput 0.14
- sphinxcontrib-httpdomain 1.7.0
- psycopg2 2.7.6.1
run:
diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index c4085f72..5e88a77f 100644
--- a/conda/bob-devel/meta.yaml
+++ b/conda/bob-devel/meta.yaml
@@ -2,8 +2,8 @@
{% set nopin = ['ca-certificates', 'certifi', 'openssl', 'libstdcxx-ng', 'libgcc-ng', 'libcxx', 'libcxxabi'] %}
package:
name: bob-devel
- # please update the version of beat-devel and update bob-devel's version there
- # as well in the same merge request.
+ # please update the version of beat-devel and update bob-devel's version
+ # there as well in the same merge request.
version: 2019.08.08
build:
@@ -17,9 +17,9 @@ build:
requirements:
host:
- python {{ python }}
- # IMPORTANT: To update this list, create a conda environment with all the below
- # packages without any pinning. Once the environment is resolved, observe those
- # versions and put them here.
+ # IMPORTANT: To update this list, create a conda environment with all the
+ # below packages without any pinning. Once the environment is resolved,
+ # observe those versions and put them here.
# Dependency list of bob packages. Everything is pinned to allow for better
# reproducibility.
@@ -29,7 +29,7 @@ requirements:
- click-plugins 1.1.1
- cmake 3.14.0
- coverage 4.5.3
- - cyvlfeat 0.4.6
+ - cyvlfeat 0.5.1
- docopt 0.6.2
# to make sure we get ffmpeg from our own channel which has more codecs
- ffmpeg 4.0 hadceb68_1 # [linux]
@@ -47,22 +47,22 @@ requirements:
- libsvm 3.22
- libtiff 4.0.10
- matplotlib 3.1.0
- - menpo 0.8.1
- - menpofit 0.5.0
+ - menpo 0.9.1
+ - menpofit 0.6.1
- mkl 2019.4
- - mne 0.15.2
- - mr.developer 1.38
+ - mne 0.18.1
+ - mr.developer 2.0.0
- nose 1.3.7
- numpy 1.16.4
- opencv 3.4.2
- pillow 6.1.0
- pkg-config 0.29.2
- - pyedflib 0.1.11
+ - pyedflib 0.1.14
- cudatoolkit 9.0 # [linux]
- pytorch 1.1.0 # [linux]
- pyyaml 5.1.1
- requests 2.22.0
- - schema 0.6.8
+ - schema 0.7.0
- scikit-image 0.15.0
- scikit-learn 0.21.2
- scipy 1.2.1
@@ -76,9 +76,10 @@ requirements:
- tensorflow 1.14.0
- torchvision 0.3.0 # [linux]
- vlfeat 0.9.21
- - zc.buildout 2.12.2
+ - zc.buildout 2.13.2
- zc.recipe.egg 2.0.7
- # beat-devel direct dependencies that leak to bob-devel as indirect dependencies:
+ # beat-devel direct dependencies that leak to bob-devel as indirect
+ # dependencies:
- termcolor 1.1.0
# semi-supported dependencies (drop them if they conflict):
- dlib 19.7
--
GitLab