Commit 921ceac4 authored by André Anjos's avatar André Anjos 💬
Browse files

Merge branch 'unpin-conda-4-6' into 'master'

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

See merge request !96
parents 7cf97327 d9287179
Pipeline #32469 passed with stages
in 8 minutes and 18 seconds
......@@ -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"
......
......@@ -31,7 +31,7 @@ requirements:
- black >=19
- click >=7
- click-plugins
- conda=4.6
- conda=4
- conda-build=3.16
- conda-verify=3
- certifi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment