From 9cf6995ce94cfc2e633583eacf8a0c5f8105c89b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 15 Oct 2019 14:58:59 -0500 Subject: [PATCH 1/3] CI: Fix miniconda upgrade issues --- ci/setup_env.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index be8c3645691fe..4aec50e5856f2 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -41,9 +41,12 @@ else exit 1 fi -wget -q "https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh" -O miniconda.sh -chmod +x miniconda.sh -./miniconda.sh -b +# wget -q "https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh" -O miniconda.sh +wget -q "https://repo.anconda.com/pkgs/misc/conda-execs/conda-latest-$CONDA_OS.exe" -O conda.exe +export CONDA_ALWAYS_YES=1 +chmod +x conda.exe + +./conda.exe create -p $MINICONDA_DIR python=3.7 conda export PATH=$MINICONDA_DIR/bin:$PATH From ba3ebb0c54c5b56e6d73c269a88733082c472c74 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 15 Oct 2019 15:05:39 -0500 Subject: [PATCH 2/3] Revert "CI: Fix miniconda upgrade issues" This reverts commit 9cf6995ce94cfc2e633583eacf8a0c5f8105c89b. --- ci/setup_env.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 4aec50e5856f2..be8c3645691fe 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -41,12 +41,9 @@ else exit 1 fi -# wget -q "https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh" -O miniconda.sh -wget -q "https://repo.anconda.com/pkgs/misc/conda-execs/conda-latest-$CONDA_OS.exe" -O conda.exe -export CONDA_ALWAYS_YES=1 -chmod +x conda.exe - -./conda.exe create -p $MINICONDA_DIR python=3.7 conda +wget -q "https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh" -O miniconda.sh +chmod +x miniconda.sh +./miniconda.sh -b export PATH=$MINICONDA_DIR/bin:$PATH From 2228eee7e1911cfc15b8b0c652903199e1ce5674 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 15 Oct 2019 15:08:11 -0500 Subject: [PATCH 3/3] CI: Fix CI --- ci/setup_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index be8c3645691fe..794130355fd74 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -55,6 +55,7 @@ echo echo "update conda" conda config --set ssl_verify false conda config --set quiet true --set always_yes true --set changeps1 false +conda install pip # create conda to create a historical artifact for pip & setuptools conda update -n base conda echo "conda info -a"