From a8b78feb1e7d9b4170ec676c4e724899d146d8ba Mon Sep 17 00:00:00 2001 From: mperry Date: Thu, 21 Jul 2022 09:14:58 -0600 Subject: [PATCH 1/2] remove perf test which can change depending on environment --- tests/test_zonal.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/tests/test_zonal.py b/tests/test_zonal.py index 16b2b8f..c145643 100644 --- a/tests/test_zonal.py +++ b/tests/test_zonal.py @@ -1,5 +1,4 @@ # test zonal stats -from datetime import datetime import json import os import pytest @@ -558,28 +557,6 @@ def test_nan_counts(): assert 'nan' not in res -def test_performance(): - polygons_path = os.path.join(DATA, 'polygons.shp') - polygons = list(read_features(polygons_path)) - polygons = [polygon for polygon in polygons for _ in range(100)] - - start_time = datetime.now() - stats = zonal_stats(polygons, raster) - secs_taken = (datetime.now() - start_time).total_seconds() - for key in ['count', 'min', 'max', 'mean']: - assert key in stats[0] - assert len(stats) == len(polygons) - assert stats[0]['count'] == 75 - assert round(stats[0]['mean'], 2) == 14.66 - - if sys.platform == "linux" or sys.platform == "linux2": - assert secs_taken < 1 - elif sys.platform == "darwin": # OS X - assert secs_taken < 1 - elif sys.platform == "win32": - assert secs_taken < 5 - - # Optional tests def test_geodataframe_zonal(): polygons = os.path.join(DATA, 'polygons.shp') From 678dc08a34fa8b4f0e9814a3268c21ee253ac2d8 Mon Sep 17 00:00:00 2001 From: mperry Date: Thu, 21 Jul 2022 09:17:25 -0600 Subject: [PATCH 2/2] bump version --- CHANGELOG.txt | 5 ++++- src/rasterstats/_version.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8290667..bd954c4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +0.17.0 +- Fix performance regression due to platform.architecture performance #258 + 0.16.0 - Fix deprecation warning with shapely 1.8+ #250 @@ -44,7 +47,7 @@ 0.10.0 - Added a generator variant of zonal_stats (gen_zonal_stats) and point_query (gen_point_query) which yield results instead of returning a list -- Dependency on cligj to standardize the geojson input/output args and opts +- Dependency on cligj to standardize the geojson input/output args and opts - Input/Output can be geojson sequences; allows for stream processing 0.9.2 diff --git a/src/rasterstats/_version.py b/src/rasterstats/_version.py index 5a313cc..fd86b3e 100644 --- a/src/rasterstats/_version.py +++ b/src/rasterstats/_version.py @@ -1 +1 @@ -__version__ = "0.16.0" +__version__ = "0.17.0"