From d92871791aae28a46540523a98d38dbff150272b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 13 Aug 2019 15:55:29 +0200
Subject: [PATCH] [conda] Unpin (again) conda=4.6 - does not really work on
base environment
---
bob/devtools/bootstrap.py | 2 +-
conda/meta.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 7d3ae0f7..a5d2b0ad 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -422,7 +422,7 @@ if __name__ == "__main__":
with open(condarc, "wt") as f:
f.write(_BASE_CONDARC)
- conda_version = "4.6"
+ conda_version = "4"
conda_build_version = "3.16"
conda_verify_version = "3"
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 4c36a3c4..ab99512b 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -31,7 +31,7 @@ requirements:
- black >=19
- click >=7
- click-plugins
- - conda=4.6
+ - conda=4
- conda-build=3.16
- conda-verify=3
- certifi
--
GitLab