From 06c176e76fa648e5f1049be3dd8f097dd5538c97 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 5 Apr 2018 15:26:51 +0200
Subject: [PATCH] Update conda to any latest 4 version
---
conda/build-condarc | 8 ++++----
gitlab/before_build.sh | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/conda/build-condarc b/conda/build-condarc
index 8cf2009..bcf7fb9 100644
--- a/conda/build-condarc
+++ b/conda/build-condarc
@@ -1,8 +1,8 @@
default_channels:
- - https://repo.continuum.io/pkgs/main
- - https://repo.continuum.io/pkgs/free
- - https://repo.continuum.io/pkgs/r
- - https://repo.continuum.io/pkgs/pro
+ - https://repo.anaconda.com/pkgs/main
+ - https://repo.anaconda.com/pkgs/free
+ - https://repo.anaconda.com/pkgs/r
+ - https://repo.anaconda.com/pkgs/pro
add_pip_as_python_dependency: false
show_channel_urls: true
anaconda_upload: false
diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh
index 655ff47..1d46495 100755
--- a/gitlab/before_build.sh
+++ b/gitlab/before_build.sh
@@ -14,10 +14,10 @@ touch ${CONDA_ROOT}/pkgs/urls.txt
cat <<EOF > ${CONDARC}
default_channels: #!final
- - https://repo.continuum.io/pkgs/main
- - https://repo.continuum.io/pkgs/free
- - https://repo.continuum.io/pkgs/r
- - https://repo.continuum.io/pkgs/pro
+ - https://repo.anaconda.com/pkgs/main
+ - https://repo.anaconda.com/pkgs/free
+ - https://repo.anaconda.com/pkgs/r
+ - https://repo.anaconda.com/pkgs/pro
add_pip_as_python_dependency: false #!final
changeps1: false #!final
always_yes: true #!final
@@ -43,7 +43,7 @@ echo "Contents of \`${CONDARC}':"
cat ${CONDARC}
# updates conda installation
-run_cmd ${CONDA_ROOT}/bin/conda install python conda=4.4 curl conda-build=3
+run_cmd ${CONDA_ROOT}/bin/conda install python conda=4 curl conda-build=3
# cleans up
run_cmd ${CONDA_ROOT}/bin/conda clean --lock
--
GitLab