From e6dee9596f2c7bb2e1b4398c088826592596e5b2 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Tue, 25 Feb 2020 07:42:07 -0700
Subject: [PATCH 01/21] fix dakota bug

---
 umami/metric.py   | 10 +++++-----
 umami/residual.py | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/umami/metric.py b/umami/metric.py
index 2798ac6..aeb10a0 100755
--- a/umami/metric.py
+++ b/umami/metric.py
@@ -220,10 +220,10 @@ def write_metrics_to_file(self, path, style, decimals=3):
         >>> file_contents = out.getvalue().splitlines()
         >>> for line in file_contents:
         ...     print(line.strip())
-        9.0 # me
-        5.0 # ep10
-        5.0 # oid1_mean
-        8 # sn1
+        9.0 me
+        5.0 ep10
+        5.0 oid1_mean
+        8 sn1
 
         Next we output in *yaml* style, in which each metric is serialized in
         YAML format.
@@ -241,7 +241,7 @@ def write_metrics_to_file(self, path, style, decimals=3):
         if style == "dakota":
             stream = "\n".join(
                 [
-                    str(np.round(val, decimals=decimals)) + " # " + str(key)
+                    str(np.round(val, decimals=decimals)) + " " + str(key)
                     for key, val in self._values.items()
                 ]
             )
diff --git a/umami/residual.py b/umami/residual.py
index 2880ad2..65620fa 100644
--- a/umami/residual.py
+++ b/umami/residual.py
@@ -322,10 +322,10 @@ def write_residuals_to_file(self, path, style, decimals=3):
         >>> file_contents = out.getvalue().splitlines()
         >>> for line in file_contents:
         ...     print(line.strip())
-        17.533 # me
-        9.909 # ep10
-        9.813 # oid1_mean
-        -41 # sn1
+        17.533 me
+        9.909 ep10
+        9.813 oid1_mean
+        -41 sn1
 
         Next we output in *yaml* style, in which each metric is serialized in
         YAML format.
@@ -343,7 +343,7 @@ def write_residuals_to_file(self, path, style, decimals=3):
         if style == "dakota":
             stream = "\n".join(
                 [
-                    str(np.round(val, decimals=decimals)) + " # " + str(key)
+                    str(np.round(val, decimals=decimals)) + " " + str(key)
                     for key, val in self._values.items()
                 ]
             )

From 17b3304e54a89cd7b616e4b97c5ac45cf5d51968 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Tue, 25 Feb 2020 14:50:35 -0700
Subject: [PATCH 02/21] switch from vdg to hmg

---
 notebooks/OtherIO_options.ipynb | 45 +++++++++++++++------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/notebooks/OtherIO_options.ipynb b/notebooks/OtherIO_options.ipynb
index 92bfc27..9938e99 100644
--- a/notebooks/OtherIO_options.ipynb
+++ b/notebooks/OtherIO_options.ipynb
@@ -40,7 +40,7 @@
     "\n",
     "import rasterio\n",
     "\n",
-    "from landlab import imshow_grid, RasterModelGrid, VoronoiDelaunayGrid\n",
+    "from landlab import imshow_grid, RasterModelGrid, HexModelGrid\n",
     "\n",
     "from umami import Metric"
    ]
@@ -252,11 +252,11 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Step 3: Use irregular data and a `VoronoiDelaunayGrid`\n",
+    "## Step 3: Use irregular data and a `HexModelGrid`\n",
     "\n",
     "As a final example, we will look at specifying umami with an irregular grid. We won't import any standard format of irregular data but will create some by interpolating the regular data using the scipy tool [RegularGridInterpolator](https://docs.scipy.org/doc/scipy-0.16.0/reference/generated/scipy.interpolate.RegularGridInterpolator.html).\n",
     "\n",
-    "We use a tenth as many grid nodes as we had in the prior example. This is just for speed, feel free to adjust the value for `factor` to change this. \n",
+    "We use a smaller number of nodes as we had in the prior example. This is just for speed, feel free to adjust the value for `factor` to change this. \n",
     "\n",
     "We start by creating a set of grid node locations in x and y. "
    ]
@@ -267,15 +267,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "factor = 11\n",
-    "nnodes = int(rmg.x_of_node.size / factor)\n",
-    "np.random.seed(27)\n",
+    "factor = 5\n",
+    "dx = rmg.spacing[0] * factor\n",
     "\n",
-    "# select a random subset of x_of_node and y_of_node and permute by a small quantity.\n",
-    "# permute only in x, which allows the ordering of nodes to be maintained \n",
-    "index = np.linspace(0, rmg.x_of_node.size-1, nnodes, dtype=int)\n",
-    "random_x = rmg.x_of_node[index] + 0.4 * rmg.spacing[0] * np.random.randn(index.size)\n",
-    "random_y = rmg.y_of_node[index] "
+    "hmg = HexModelGrid((int(rmg.shape[0]/factor*1.2), int(rmg.shape[1]/factor)+1), \n",
+    "                   dx, \n",
+    "                   node_layout=\"rect\", \n",
+    "                   xy_of_lower_left=rmg.xy_of_lower_left)"
    ]
   },
   {
@@ -292,7 +290,7 @@
    "outputs": [],
    "source": [
     "plt.plot(rmg.x_of_node, rmg.y_of_node, 'k.',  markersize=2, label=\"Raster Points\")\n",
-    "plt.plot(random_x, random_y, 'm.', label=\"Irregular Points\")\n",
+    "plt.plot(hmg.x_of_node, hmg.y_of_node, 'm.', label=\"Irregular Points\")\n",
     "plt.xlim(-105.40, -105.375)\n",
     "plt.ylim(40.00, 40.025)"
    ]
@@ -314,14 +312,14 @@
     "                                      rmg.x_of_node.reshape(rmg.shape)[0, :]),\n",
     "                                     z.reshape(rmg.shape), bounds_error=False, fill_value=None)\n",
     "\n",
-    "interp_z = interp_obj((random_y, random_x))"
+    "interp_z = interp_obj((hmg.y_of_node, hmg.x_of_node))"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Next we create a `VoronoiDelaunayGrid` and add `topographic__elevation` to it. \n",
+    "Next we create a `HexModelGrid` and add `topographic__elevation` to it. \n",
     "\n",
     "One nice feature of the `imshow_grid` function is that it works for both regular and irregular grids. "
    ]
@@ -332,10 +330,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "vdg = VoronoiDelaunayGrid(random_x, random_y)\n",
-    "z = vdg.add_field(\"topographic__elevation\", interp_z, at=\"node\")\n",
+    "z = hmg.add_field(\"topographic__elevation\", interp_z, at=\"node\")\n",
     "\n",
-    "imshow_grid(vdg, z, cmap=\"terrain\")"
+    "imshow_grid(hmg, z, cmap=\"terrain\")"
    ]
   },
   {
@@ -367,8 +364,8 @@
     "    }\n",
     "}\n",
     "\n",
-    "vmg_metric = Metric(vdg, metrics=metrics)\n",
-    "vmg_metric.calculate()"
+    "hmg_metric = Metric(hmg, metrics=metrics)\n",
+    "hmg_metric.calculate()"
    ]
   },
   {
@@ -377,7 +374,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "vmg_metric.names"
+    "hmg_metric.names"
    ]
   },
   {
@@ -386,7 +383,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "vmg_metric.values"
+    "hmg_metric.values"
    ]
   },
   {
@@ -402,9 +399,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for n in vmg_metric.names:\n",
-    "    abs_change = np.abs(vmg_metric.value(n) - rmg_metric.value(n))\n",
-    "    pct_change =  abs_change /( 2* (vmg_metric.value(n) + rmg_metric.value(n)))\n",
+    "for n in hmg_metric.names:\n",
+    "    abs_change = np.abs(hmg_metric.value(n) - rmg_metric.value(n))\n",
+    "    pct_change =  abs_change /( (hmg_metric.value(n) + rmg_metric.value(n))/2)\n",
     "    print(n, \"\\n  abs_change: \", abs_change, \"\\n  pct_change: \", pct_change)"
    ]
   },

From 0cc7851671a8e3f60e71a5685596db3c5c442ac9 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:25:43 -0700
Subject: [PATCH 03/21] update appveyor

---
 appveyor.yml | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ba554a9..3dc6a2a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,46 +4,32 @@ environment:
   matrix:
 
     - TARGET_ARCH: x64
-      CONDA_NPY: 111
-      CONDA_INSTALL_LOCN: C:\\Miniconda37-x64
-      CONDA_PY: 3.6
+      PYTHON: "C:\\Python38-x64"
 
     - TARGET_ARCH: x64
-      CONDA_NPY: 111
-      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
-      CONDA_PY: 3.7
+      PYTHON: "C:\\Python37-x64"
 
     - TARGET_ARCH: x64
-      CONDA_NPY: 111
-      CONDA_INSTALL_LOCN: C:\\Miniconda37-x64
-      CONDA_PY: 3.8
+      PYTHON: "C:\\Python36-x64"
 
 platform:
   - x64
 
-os: Previous Visual Studio 2015
-
 init:
-  - "ECHO %CONDA_INSTALL_LOCN% %CONDA_PY% %HOME% %PLATFORM%"
+  - "ECHO %PYTHON% %HOME% %PLATFORM%"
   - "ECHO %APPVEYOR_REPO_BRANCH%"
 
 install:
-  - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-  - cmd: conda update --yes --quiet conda
-  - cmd: set PYTHONUNBUFFERED=1
-  - cmd: conda config --set always_yes yes
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - cmd: pip install pytest
-  - cmd: pip install jupyter pandas plotnine holoviews tqdm
+  - cmd: pip install numpy
+  - cmd: pip install jupyter pandas plotnine holoviews tqdm rasterio
   - cmd: pip install terrainbento --pre
-  - cmd: conda install rasterio -c conda-forge
-  - cmd: conda install landlab -c conda-forge
-  - cmd: conda info
-  - cmd: conda list
+  - cmd: pip install landlab --pre
 
 build: false
 
 test_script:
-  - pip install numpy
   - pip install -e .
   - pytest -vvv
 

From a960ecc68f9f1ed64ce32b20e004c8fa19c8f0ae Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:31:41 -0700
Subject: [PATCH 04/21] update rasterio

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3dc6a2a..f49f7d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,9 +21,10 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - cmd: conda install rasterio -c conda-forge
   - cmd: pip install pytest
   - cmd: pip install numpy
-  - cmd: pip install jupyter pandas plotnine holoviews tqdm rasterio
+  - cmd: pip install jupyter pandas plotnine holoviews tqdm
   - cmd: pip install terrainbento --pre
   - cmd: pip install landlab --pre
 

From aeeef8bb30f896cc0685401e862357f198a0276d Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:34:40 -0700
Subject: [PATCH 05/21] gdal fix

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index f49f7d8..14ddb41 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,9 +21,10 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - cmd: conda install rasterio -c conda-forge
   - cmd: pip install pytest
   - cmd: pip install numpy
+  - cmd: pip install GDAL
+  - cmd: pip install rasterio
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
   - cmd: pip install terrainbento --pre
   - cmd: pip install landlab --pre

From 39f0efe2cff8e3fd6b2195c3b8f1e9bd555d79b4 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:41:20 -0700
Subject: [PATCH 06/21] more appveyor updates

---
 appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 14ddb41..ff69300 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,13 +21,15 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "python -VV"
+  - cmd: python -m pip install --upgrade pip
   - cmd: pip install pytest
   - cmd: pip install numpy
   - cmd: pip install GDAL
   - cmd: pip install rasterio
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
-  - cmd: pip install terrainbento --pre
   - cmd: pip install landlab --pre
+  - cmd: pip install terrainbento --pre
 
 build: false
 

From aee52331f265bdfad521a5af010ecaa6ff7e4cc9 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:45:06 -0700
Subject: [PATCH 07/21] conda-forge rasterio

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

diff --git a/appveyor.yml b/appveyor.yml
index ff69300..4228394 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,8 +25,7 @@ install:
   - cmd: python -m pip install --upgrade pip
   - cmd: pip install pytest
   - cmd: pip install numpy
-  - cmd: pip install GDAL
-  - cmd: pip install rasterio
+  - cmd: conda install rasterio -c conda-forge
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
   - cmd: pip install landlab --pre
   - cmd: pip install terrainbento --pre

From ca872a623caa2a226770187ae44544d882103f35 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 11:57:22 -0700
Subject: [PATCH 08/21] add miniconda bits

---
 appveyor.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4228394..11e3799 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,22 +5,25 @@ environment:
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python38-x64"
+      MINICONDA: "C:\\Miniconda38-x64"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python37-x64"
+      MINICONDA: "C:\\Miniconda37-x64"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python36-x64"
+      MINICONDA: "C:\\Miniconda36-x64"
 
 platform:
   - x64
 
 init:
-  - "ECHO %PYTHON% %HOME% %PLATFORM%"
+  - "ECHO %PYTHON% %MINICONDA% %HOME% %PLATFORM%"
   - "ECHO %APPVEYOR_REPO_BRANCH%"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "SET PATH=%PYTHON%;%PYTHON%\\PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
   - "python -VV"
   - cmd: python -m pip install --upgrade pip
   - cmd: pip install pytest

From 85fac4ba444fc77960f9a038297b25e4c5d74691 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 13:09:56 -0700
Subject: [PATCH 09/21] fix path

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 11e3799..d47e421 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,7 @@ init:
   - "ECHO %APPVEYOR_REPO_BRANCH%"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
   - "python -VV"
   - cmd: python -m pip install --upgrade pip
   - cmd: pip install pytest

From 3487c34a6b8def1f03a03d56d7967d0f8af469e1 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 13:11:17 -0700
Subject: [PATCH 10/21] add conda configurations and udpates

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

diff --git a/appveyor.yml b/appveyor.yml
index d47e421..1008b83 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,6 +26,8 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
   - "python -VV"
   - cmd: python -m pip install --upgrade pip
+  - cmd: conda update --yes --quiet conda
+  - cmd: conda config --set always_yes yes
   - cmd: pip install pytest
   - cmd: pip install numpy
   - cmd: conda install rasterio -c conda-forge

From 4d571e5eade68a57ea1e22f0bf228ef916e2fadd Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 15:12:38 -0700
Subject: [PATCH 11/21] attempt to activate conda.

---
 appveyor.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1008b83..5589a7c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,8 +23,9 @@ init:
   - "ECHO %APPVEYOR_REPO_BRANCH%"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python -VV"
+  - cmd: call %MINICONDA%\Scripts\activate.bat
   - cmd: python -m pip install --upgrade pip
   - cmd: conda update --yes --quiet conda
   - cmd: conda config --set always_yes yes

From f62be0301ab0aa12aa7abd75b0bc4c20e4daf1cc Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 15:22:32 -0700
Subject: [PATCH 12/21] simplifying miniconda?

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5589a7c..87c959c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,15 +5,15 @@ environment:
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python38-x64"
-      MINICONDA: "C:\\Miniconda38-x64"
+      MINICONDA: "C:\\Miniconda3"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python37-x64"
-      MINICONDA: "C:\\Miniconda37-x64"
+      MINICONDA: "C:\\Miniconda3"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python36-x64"
-      MINICONDA: "C:\\Miniconda36-x64"
+      MINICONDA: "C:\\Miniconda3"
 
 platform:
   - x64

From f61f069bfdf1a5f9b3d3393b282b5f00510c2b6b Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 15:50:29 -0700
Subject: [PATCH 13/21] --pre order

---
 .travis.yml  | 2 +-
 appveyor.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e13b43..f21adeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,6 @@ install:
 script:
 - pip install pytest pytest-cov coveralls
 - pip install jupyter pandas plotnine holoviews tqdm rasterio
-- pip install terrainbento --pre
+- pip install --pre terrainbento 
 - pytest umami tests/ --doctest-modules --cov=umami --cov-report=xml:$(pwd)/coverage.xml -vvv
 after_success: coveralls
diff --git a/appveyor.yml b/appveyor.yml
index 87c959c..c8f2e19 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,8 +33,8 @@ install:
   - cmd: pip install numpy
   - cmd: conda install rasterio -c conda-forge
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
-  - cmd: pip install landlab --pre
-  - cmd: pip install terrainbento --pre
+  - cmd: pip install --pre landlab
+  - cmd: pip install --pre terrainbento 
 
 build: false
 

From 35cfd408714b8bb75c86945a7027095644c70830 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Wed, 26 Feb 2020 17:14:48 -0700
Subject: [PATCH 14/21] reorder?

---
 appveyor.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c8f2e19..8533756 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,16 +25,18 @@ init:
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python -VV"
-  - cmd: call %MINICONDA%\Scripts\activate.bat
   - cmd: python -m pip install --upgrade pip
-  - cmd: conda update --yes --quiet conda
-  - cmd: conda config --set always_yes yes
-  - cmd: pip install pytest
   - cmd: pip install numpy
-  - cmd: conda install rasterio -c conda-forge
+  - cmd: pip install statsmodels
+  - cmd: pip install --pre landlab
+  - cmd: pip install twine pytest pytest-cov pytest-datadir
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
   - cmd: pip install --pre landlab
-  - cmd: pip install --pre terrainbento 
+  - cmd: pip install --pre terrainbento
+  - cmd: call %MINICONDA%\Scripts\activate.bat
+  - cmd: conda update --yes --quiet conda
+  - cmd: conda config --set always_yes yes
+  - cmd: conda install rasterio -c conda-forge
 
 build: false
 

From 379117fd79060d7e142e12b1b73474fb60d03880 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Thu, 27 Feb 2020 14:54:47 -0700
Subject: [PATCH 15/21] remove extra, add conda info conda list

---
 appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8533756..edf8b51 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,14 +29,15 @@ install:
   - cmd: pip install numpy
   - cmd: pip install statsmodels
   - cmd: pip install --pre landlab
+  - cmd: pip install --pre terrainbento
   - cmd: pip install twine pytest pytest-cov pytest-datadir
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
-  - cmd: pip install --pre landlab
-  - cmd: pip install --pre terrainbento
   - cmd: call %MINICONDA%\Scripts\activate.bat
   - cmd: conda update --yes --quiet conda
   - cmd: conda config --set always_yes yes
   - cmd: conda install rasterio -c conda-forge
+  - cmd: conda info
+  - cmd: conda list
 
 build: false
 

From 89551c03cd840aadcd2442e9e2ac41cf4d371fda Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Thu, 27 Feb 2020 15:01:25 -0700
Subject: [PATCH 16/21] reorder conda install

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index edf8b51..32b501f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,17 +24,17 @@ init:
 
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - cmd: call %MINICONDA%\Scripts\activate.bat
   - "python -VV"
   - cmd: python -m pip install --upgrade pip
+  - cmd: conda update --yes --quiet conda
+  - cmd: conda config --set always_yes yes
   - cmd: pip install numpy
   - cmd: pip install statsmodels
   - cmd: pip install --pre landlab
   - cmd: pip install --pre terrainbento
   - cmd: pip install twine pytest pytest-cov pytest-datadir
   - cmd: pip install jupyter pandas plotnine holoviews tqdm
-  - cmd: call %MINICONDA%\Scripts\activate.bat
-  - cmd: conda update --yes --quiet conda
-  - cmd: conda config --set always_yes yes
   - cmd: conda install rasterio -c conda-forge
   - cmd: conda info
   - cmd: conda list

From 9dc07cc3fa389af5b0a7193a537d83355f0bef65 Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Fri, 28 Feb 2020 09:42:38 -0700
Subject: [PATCH 17/21] switching to only conda

---
 appveyor.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 32b501f..15bfef9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,16 +26,10 @@ install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - cmd: call %MINICONDA%\Scripts\activate.bat
   - "python -VV"
-  - cmd: python -m pip install --upgrade pip
   - cmd: conda update --yes --quiet conda
   - cmd: conda config --set always_yes yes
-  - cmd: pip install numpy
-  - cmd: pip install statsmodels
-  - cmd: pip install --pre landlab
-  - cmd: pip install --pre terrainbento
-  - cmd: pip install twine pytest pytest-cov pytest-datadir
-  - cmd: pip install jupyter pandas plotnine holoviews tqdm
-  - cmd: conda install rasterio -c conda-forge
+  - cmd: conda install numpy statsmodels landlab terrainbento twine pytest pytest-cov pytest-datadir rasterio -c conda-forge
+  - cmd: conda install jupyter pandas plotnine holoviews tqdm -c conda-forge
   - cmd: conda info
   - cmd: conda list
 

From 97baee1ed61ddfc7c38f3eca92a49023b901420e Mon Sep 17 00:00:00 2001
From: Katy Barnhart <katy.barnhart@gmail.com>
Date: Fri, 28 Feb 2020 10:49:49 -0700
Subject: [PATCH 18/21] conda env

---
 appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 15bfef9..496bccf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,8 +28,9 @@ install:
   - "python -VV"
   - cmd: conda update --yes --quiet conda
   - cmd: conda config --set always_yes yes
-  - cmd: conda install numpy statsmodels landlab terrainbento twine pytest pytest-cov pytest-datadir rasterio -c conda-forge
-  - cmd: conda install jupyter pandas plotnine holoviews tqdm -c conda-forge
+  - cmd: conda config --add channels conda-forge
+  - cmd: conda env create -f environment-dev.yml
+  - cmd: conda activate umami-dev
   - cmd: conda info
   - cmd: conda list
 

From 6ba6a57ce197a52b928a42642f21109104e7eaa7 Mon Sep 17 00:00:00 2001
From: mcflugen <mcflugen@gmail.com>
Date: Fri, 28 Feb 2020 12:11:27 -0700
Subject: [PATCH 19/21] remove system python from path

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 496bccf..dc722ae 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,7 +23,6 @@ init:
   - "ECHO %APPVEYOR_REPO_BRANCH%"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - cmd: call %MINICONDA%\Scripts\activate.bat
   - "python -VV"
   - cmd: conda update --yes --quiet conda

From 5510518301299b2cd8df941319fb1d668475149a Mon Sep 17 00:00:00 2001
From: mcflugen <mcflugen@gmail.com>
Date: Fri, 28 Feb 2020 12:20:40 -0700
Subject: [PATCH 20/21] print conda info before building

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index dc722ae..8f6f156 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,6 +28,9 @@ install:
   - cmd: conda update --yes --quiet conda
   - cmd: conda config --set always_yes yes
   - cmd: conda config --add channels conda-forge
+  - cmd: conda info
+  - cmd: conda list
+  - cmd: conda search landlab
   - cmd: conda env create -f environment-dev.yml
   - cmd: conda activate umami-dev
   - cmd: conda info

From 2c5118e7e9b80eeecdfc9ba9a8b92cc64a576077 Mon Sep 17 00:00:00 2001
From: mcflugen <mcflugen@gmail.com>
Date: Fri, 28 Feb 2020 12:28:08 -0700
Subject: [PATCH 21/21] use x64 Miniconda

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8f6f156..56d4c64 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,15 +5,15 @@ environment:
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python38-x64"
-      MINICONDA: "C:\\Miniconda3"
+      MINICONDA: "C:\\Miniconda3-x64"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python37-x64"
-      MINICONDA: "C:\\Miniconda3"
+      MINICONDA: "C:\\Miniconda3-x64"
 
     - TARGET_ARCH: x64
       PYTHON: "C:\\Python36-x64"
-      MINICONDA: "C:\\Miniconda3"
+      MINICONDA: "C:\\Miniconda3-x64"
 
 platform:
   - x64