[conda] Unpin (again) conda=4.6 - does not really work on base environment

d9287179 · André Anjos · 7cf97327 · d9287179 · d9287179
Commit d9287179 authored Aug 13, 2019 by André Anjos 💬
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

bob/devtools/bootstrap.py bob/devtools/bootstrap.py +1 -1

conda/meta.yaml conda/meta.yaml +1 -1

No files found.
--- 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"


--- 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