From fc1bf005bbc81053ac92aebaa7d287e5b3bc4ae9 Mon Sep 17 00:00:00 2001
From: AsgerPetersen <asgerpetersen@gmail.com>
Date: Wed, 15 Jan 2020 08:35:59 +0100
Subject: [PATCH 1/3] Fix pyinstaller exe error

Pin setuptools at 44.0.0 for now.

pypa/setuptools#1963
---
 environment-dev.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environment-dev.yml b/environment-dev.yml
index 83f8d3f..d965e2b 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -12,6 +12,7 @@ dependencies:
   - pytest
   - python=3.7
   - scipy
+  - setuptools==44.0.0
   - pip:
     - click-log==0.1.8
 

From 19123af517195d826d70249d5336bdd0950724a3 Mon Sep 17 00:00:00 2001
From: AsgerPetersen <asgerpetersen@gmail.com>
Date: Wed, 15 Jan 2020 09:58:56 +0100
Subject: [PATCH 2/3] Fix changed crs handling in gdal 3.0.3

GDAL 3.0.3 no longer writes towgs84

https://github.com/OSGeo/gdal/commit/8f549e5d6ba92c781bcc6fc7d1c16e81863fa714
---
 tests/test_raster_dem.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_raster_dem.py b/tests/test_raster_dem.py
index 9695845..45bad8c 100644
--- a/tests/test_raster_dem.py
+++ b/tests/test_raster_dem.py
@@ -1,5 +1,5 @@
 import numpy as np
-
+from osgeo import osr
 from malstroem import dem, io
 from data.fixtures import dtmfile, filledfile, flowdirnoflatsfile
 
@@ -27,7 +27,9 @@ def assert_rasters_are_equal(file1, file2):
     reader2 = io.RasterReader(file2)
 
     assert reader1.transform == reader2.transform
-    assert reader1.crs == reader2.crs
+    sr1 = osr.SpatialReference(reader1.crs)
+    sr2 = osr.SpatialReference(reader2.crs)
+    assert sr1.IsSame(sr2), f"CRSs are different: sr1: {sr1.ExportToWkt()} sr2: {sr2.ExportToWkt()}"
 
     data1 = reader1.read()
     data2 = reader2.read()

From 3c135d73dc99d1568619063183aca3692bb356a2 Mon Sep 17 00:00:00 2001
From: AsgerPetersen <asgerpetersen@gmail.com>
Date: Wed, 15 Jan 2020 10:43:39 +0100
Subject: [PATCH 3/3] appveyor test malstroem.exe

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

diff --git a/appveyor.yml b/appveyor.yml
index 23a5656..5d1a36a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,6 +41,10 @@ test_script:
 after_test:
   - pyinstaller malstroem.spec
   - ps: ls dist
+  # Check that malstroem.exe works
+  - conda deactivate
+  - ps: md test_outdir
+  - ps: dist/malstroem complete -dem tests/data/dtm.tif -outdir test_outdir -r 10
 
 artifacts:
   - path: dist\*
\ No newline at end of file