From 808a814a1472d5e8bb70bbb15112d0c823dcd65b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 12 Dec 2019 15:37:28 +0100
Subject: [PATCH] Revert "[bootstrap] Force upgrade to conda=4.8 due to link
errors"
This reverts commit 0012b6ed4c49db0665fd737357429175f1e81faa.
---
bob/devtools/bootstrap.py | 18 +++++++++---------
conda/meta.yaml | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 4cfe7bb0..f565e26b 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -486,9 +486,9 @@ if __name__ == "__main__":
)
)
- conda_version = ">=4.8"
- conda_build_version = ">=3"
- conda_verify_version = ">=3"
+ conda_version = "4"
+ conda_build_version = "3"
+ conda_verify_version = "3"
conda_verbosity = []
# if args.verbose >= 2:
@@ -506,9 +506,9 @@ if __name__ == "__main__":
"-n",
"base",
"python",
- "conda%s" % conda_version,
- "conda-build%s" % conda_build_version,
- "conda-verify%s" % conda_verify_version,
+ "conda=%s" % conda_version,
+ "conda-build=%s" % conda_build_version,
+ "conda-verify=%s" % conda_verify_version,
"twine", # required for checking readme of python (zip) distro
]
)
@@ -523,9 +523,9 @@ if __name__ == "__main__":
"-n",
"base",
"python",
- "conda%s" % conda_version,
- "conda-build%s" % conda_build_version,
- "conda-verify%s" % conda_verify_version,
+ "conda=%s" % conda_version,
+ "conda-build=%s" % conda_build_version,
+ "conda-verify=%s" % conda_verify_version,
"twine", # required for checking readme of python (zip) distro
]
)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 97fa93c5..838772de 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -31,9 +31,9 @@ requirements:
- black >=19
- click >=7
- click-plugins
- - conda >=4.8
- - conda-build >=3
- - conda-verify >=3
+ - conda=4
+ - conda-build=3
+ - conda-verify=3
- certifi
- docformatter
- pytz
--
GitLab