From 08b5757ea2a413f73f38d80fc3a1a4c5d158fc5f Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 8 Jan 2020 17:24:03 +0100
Subject: [PATCH] Revert "[bootstrap] specify conda and conda-build versions as
specs"
This reverts commit 286cbd1412f147c85c230a1f74eccf09eeaa343d.
---
bob/devtools/bootstrap.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 38b71c6b..ff0b5e50 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -538,15 +538,9 @@ if __name__ == "__main__":
cmd = ([conda_bin, conda_cmd]
+ conda_verbosity
+ channels
- + ["-n", args.envname,
- "bob.devtools",
- "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
- ])
+ + ["-n", args.envname, "bob.devtools"])
if conda_cmd == "install":
- cmd.insert(2, "--update-specs")
+ cmd += ["--update-specs"]
run_cmdline(cmd)
# print conda information for debugging purposes
--
GitLab