From 3ed6873b4c74d042d1682d09999a968a59cdfe70 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sun, 4 Aug 2019 12:47:09 +0200
Subject: [PATCH] [bootstrap/conda] Pin conda=4.16 to fix "conda update" issues
on base env
---
bob/devtools/bootstrap.py | 2 +-
conda/meta.yaml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 1f9f23ca..48b02d05 100644
--- a/bob/devtools/bootstrap.py
+++ b/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.16'
conda_build_version = '3.16'
conda_verify_version = '3'
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 0bc370a2..32f98885 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -30,7 +30,7 @@ requirements:
- setuptools
- click >=7
- click-plugins
- - conda=4
+ - conda=4.16
- 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
--
GitLab