From be98fa21c072ce1e77d0438366e9ac0ba57f2042 Mon Sep 17 00:00:00 2001
From: Jeff Whitaker <jswhit@fastmail.fm>
Date: Fri, 6 Sep 2019 13:56:38 -0600
Subject: [PATCH 1/2] trying to fix appveyor tests...

---
 .appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 807744ae..379ebb79 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,11 +2,9 @@ environment:
   CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
   matrix:
     - TARGET_ARCH: x64
-      NPY: 1.15
       PY: 3.6
 
     - TARGET_ARCH: x64
-      NPY: 1.15
       PY: 3.7
 
 platform:

From cae05f3a3d42b4425ab66023b47fe2ce49893b89 Mon Sep 17 00:00:00 2001
From: Jeff Whitaker <jswhit@fastmail.fm>
Date: Fri, 6 Sep 2019 14:09:54 -0600
Subject: [PATCH 2/2] copy some stuff from netcdf4-python .appveyor.xml

---
 .appveyor.yml | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 379ebb79..cc8fc399 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,44 +2,44 @@ environment:
   CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
   matrix:
     - TARGET_ARCH: x64
+      NPY: 1.16
       PY: 3.6
 
     - TARGET_ARCH: x64
+      NPY: 1.16
       PY: 3.7
 
 platform:
     - x64
 
 install:
-    # If there is a newer build queued for the same PR, cancel this one.
-    # The AppVeyor 'rollout builds' option is supposed to serve the same
-    # purpose but it is problematic because it tends to cancel builds pushed
-    # directly to master instead of just PR builds (or the converse).
-    # credits: JuliaLang developers.
-    - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-           throw "There are newer queued builds for this pull request, failing early." }
-
-    # Add path, activate `conda` and update conda.
-    - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-    - cmd: conda.exe config --set always_yes yes --set changeps1 no --set show_channel_urls true
-    - cmd: conda.exe update conda
-    - cmd: conda.exe config --remove channels defaults --force
-    - cmd: conda.exe config --add channels conda-forge --force
-
-    - cmd: set PYTHONUNBUFFERED=1
-
-    - cmd: conda.exe install conda-build vs2008_express_vc_python_patch
-    - cmd: call setup_x64
-    - cmd: conda.exe info --all
-    - cmd: conda.exe list
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
+
+  # Add path, activate `conda` and update conda.
+  - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+  - cmd: conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
+  - cmd: conda update conda
+  - cmd: conda config --add channels conda-forge --force
+  - cmd: conda config --set channel_priority strict
+  - cmd: set PYTHONUNBUFFERED=1
+  - cmd: conda install conda-build vs2008_express_vc_python_patch
+  - cmd: call setup_x64
+
+  - cmd: conda.exe create --name TEST python=%PY% numpy=%NPY% cython pip pytest pytest-cov
+  - cmd: conda info --all
+  - cmd: conda activate TEST
 
 # Skip .NET project specific build phase.
 build: off
 
 test_script:
-    - conda.exe create --name TEST python=%PY% numpy=%NPY% cython pip pytest pytest-cov
-    - conda activate TEST
     - python -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv
     - py.test -vv test