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 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 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()