From ee3b178473657e69f862315a8894020f2580a416 Mon Sep 17 00:00:00 2001
From: Guido Imperiale <crusaderky@gmail.com>
Date: Wed, 29 Jan 2020 17:33:01 +0000
Subject: [PATCH 1/2] Always use latest version of conda. Ensure pip is always
 installed.

---
 ci/azure/install.yml                  | 1 +
 ci/requirements/py36-bare-minimum.yml | 1 +
 ci/requirements/py36-min-nep18.yml    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ci/azure/install.yml b/ci/azure/install.yml
index e4f3a0b9e16..c7328b5ac15 100644
--- a/ci/azure/install.yml
+++ b/ci/azure/install.yml
@@ -6,6 +6,7 @@ steps:
 - template: add-conda-to-path.yml
 
 - bash: |
+    conda update -y conda
     conda env create -n xarray-tests --file ${{ parameters.env_file }}
   displayName: Install conda dependencies
 
diff --git a/ci/requirements/py36-bare-minimum.yml b/ci/requirements/py36-bare-minimum.yml
index 8b604ce02dd..ca491ad4897 100644
--- a/ci/requirements/py36-bare-minimum.yml
+++ b/ci/requirements/py36-bare-minimum.yml
@@ -4,6 +4,7 @@ channels:
 dependencies:
   - python=3.6
   - coveralls
+  - pip
   - pytest
   - pytest-cov
   - pytest-env
diff --git a/ci/requirements/py36-min-nep18.yml b/ci/requirements/py36-min-nep18.yml
index 8fe7644d626..3dac1d624dc 100644
--- a/ci/requirements/py36-min-nep18.yml
+++ b/ci/requirements/py36-min-nep18.yml
@@ -11,6 +11,7 @@ dependencies:
   - numpy=1.17
   - pandas=0.25
   - pint=0.9  # Actually not enough as it doesn't implement __array_function__yet!
+  - pip
   - pytest
   - pytest-cov
   - pytest-env

From ad14099eab2044b2dd1467f92ec4641bbdcb8bd0 Mon Sep 17 00:00:00 2001
From: Guido Imperiale <crusaderky@gmail.com>
Date: Wed, 29 Jan 2020 18:02:33 +0000
Subject: [PATCH 2/2] pip -> python -m pip

---
 ci/azure/install.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/azure/install.yml b/ci/azure/install.yml
index c7328b5ac15..e11a8b54db3 100644
--- a/ci/azure/install.yml
+++ b/ci/azure/install.yml
@@ -12,7 +12,8 @@ steps:
 
 - bash: |
     source activate xarray-tests
-    pip install -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \
+    python -m pip install \
+        -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \
         --no-deps \
         --pre \
         --upgrade \
@@ -20,7 +21,7 @@ steps:
         numpy \
         pandas \
         scipy
-    pip install \
+    python -m pip install \
         --no-deps \
         --upgrade \
         git+https://github.com/dask/dask \
@@ -34,7 +35,7 @@ steps:
 
 - bash: |
     source activate xarray-tests
-    pip install --no-deps -e .
+    python -m pip install --no-deps -e .
   displayName: Install xarray
 
 - bash: |