From ac3b4bcfb066bf8354b424b163312dea1d6033db Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 14:45:06 +0200 Subject: [PATCH 1/6] use the scipy-wheels-nightly repository for numpy, scipy and pandas --- ci/azure/install.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 60559dd2064..e65e7656448 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -13,13 +13,19 @@ steps: - bash: | source activate xarray-tests python -m pip install \ - -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \ + -f https://anaconda.org/scipy-wheels-nightly \ --no-deps \ --pre \ --upgrade \ - matplotlib \ numpy \ - scipy + scipy \ + pandas + python -m pip install \ + -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \ + --no-deps \ + --pre \ + --upgrade \ + matplotlib python -m pip install \ --no-deps \ --upgrade \ @@ -29,8 +35,7 @@ steps: git+https://github.com/Unidata/cftime \ git+https://github.com/mapbox/rasterio \ git+https://github.com/hgrecco/pint \ - git+https://github.com/pydata/bottleneck \ - git+https://github.com/pandas-dev/pandas + git+https://github.com/pydata/bottleneck condition: eq(variables['UPSTREAM_DEV'], 'true') displayName: Install upstream dev dependencies From 5b94d16b9c6833586158ebb0ceab3bb2e3a520a3 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 14:49:50 +0200 Subject: [PATCH 2/6] update the repository url --- ci/azure/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index e65e7656448..91ce966df50 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -13,7 +13,7 @@ steps: - bash: | source activate xarray-tests python -m pip install \ - -f https://anaconda.org/scipy-wheels-nightly \ + -f https://anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ --pre \ --upgrade \ From 0aabf11eb8bcf23133614ef1344e7ae1edbe593d Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 14:52:16 +0200 Subject: [PATCH 3/6] avoid installing over the conda packages --- ci/azure/install.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 91ce966df50..2650c5b918a 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -12,6 +12,18 @@ steps: - bash: | source activate xarray-tests + conda uninstall --force \ + numpy \ + scipy \ + pandas \ + matplotlib \ + dask \ + distributed \ + zarr \ + cftime \ + rasterio \ + pint \ + bottleneck python -m pip install \ -f https://anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ From aa51dc82c7a067c2cb802eef91a5199fb2cfcf65 Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 14:57:48 +0200 Subject: [PATCH 4/6] use the repository as a package index --- ci/azure/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 2650c5b918a..27dd5df12c4 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -25,7 +25,7 @@ steps: pint \ bottleneck python -m pip install \ - -f https://anaconda.org/scipy-wheels-nightly/simple \ + -i https://anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ --pre \ --upgrade \ From db5ea3831b77b33f45d01d79a8bb9aea3b770aab Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 15:18:06 +0200 Subject: [PATCH 5/6] run the uninstall with -y --- ci/azure/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 27dd5df12c4..ff8fce1f1a4 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -12,7 +12,7 @@ steps: - bash: | source activate xarray-tests - conda uninstall --force \ + conda uninstall -y --force \ numpy \ scipy \ pandas \ From d5651f35c13fe1d49925455c53e8e3db13c1376c Mon Sep 17 00:00:00 2001 From: Keewis Date: Wed, 10 Jun 2020 15:32:47 +0200 Subject: [PATCH 6/6] use the correct url for the scipy-wheels-nightly repository --- ci/azure/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index ff8fce1f1a4..eff229e863a 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -25,7 +25,7 @@ steps: pint \ bottleneck python -m pip install \ - -i https://anaconda.org/scipy-wheels-nightly/simple \ + -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \ --no-deps \ --pre \ --upgrade \