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

Update bob devel / pin conda to 4.6

See merge request !80

bob/devtools/bootstrap.py

@@ -386,7 +386,7 @@ if __name__ == '__main__':
   with open(condarc, 'wt') as f:
     f.write(_BASE_CONDARC)
 
-  conda_version = '4'
+  conda_version = '4.6'
   conda_build_version = '3.16'
   conda_verify_version = '3'
 

bob/devtools/data/conda_build_config.yaml

@@ -51,12 +51,12 @@ zip_keys:
 
 # This version of bob-devel will be used at test time of packages:
 bob_devel:
-  - 2019.07.31
+  - 2019.08.04
 
 # This version of beat-devel will be used at test time of packages. Notice it
 # uses bob-devel and should have a version that is greater or equal its value
 beat_devel:
-  - 2019.07.31
+  - 2019.08.04
 
 # The build time only dependencies (build requirements).
 # Updating these to the latest version all the time is OK and a good idea.
@@ -146,6 +146,8 @@ matplotlib:
   - 3.0.3
 menpo:
   - 0.8.1
+menpofit:
+  - 0.5.0
 mido:
   - 1.2.9
 mne:

conda/meta.yaml

@@ -30,7 +30,7 @@ requirements:
     - setuptools
     - click >=7
     - click-plugins
-    - conda=4
+    - conda=4.6
     - conda-build=3.16
     - conda-verify=3
     - certifi
@@ -90,7 +90,7 @@ test:
     - bdt ci readme --help
     - bdt ci clean --help
     - bdt ci nightlies --help
-    - bdt ci docs --help 
+    - bdt ci docs --help
     - sphinx-build -aEW ${PREFIX}/share/doc/{{ name }}/doc sphinx
     - if [ -n "${CI_PROJECT_DIR}" ]; then mv sphinx "${CI_PROJECT_DIR}/"; fi