From b95d62233b3fbfea63cbd22e2fd33c087da85e41 Mon Sep 17 00:00:00 2001
From: Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
Date: Wed, 10 Jul 2019 09:43:26 +0200
Subject: [PATCH] Revert "Merge branch 'new-conda-build' into 'master'"
This reverts merge request !66
---
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 96e7dfd6..69748859 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -387,7 +387,7 @@ if __name__ == '__main__':
f.write(_BASE_CONDARC)
conda_version = '4'
- conda_build_version = '3'
+ conda_build_version = '3.16'
conda_verify_version = '3'
conda_verbosity = []
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 31a56954..0bc370a2 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -31,7 +31,7 @@ requirements:
- click >=7
- click-plugins
- conda=4
- - conda-build=3
+ - conda-build=3.16
- conda-verify=3
- certifi
- pytz
@@ -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