Explore updating with latest version of upstream python-rasterstats

.git-blame-ignore-revs

@@ -0,0 +1,7 @@
+# When making commits that are strictly formatting/style changes, add the
+# commit hash here, so git blame can ignore the change.
+#
+# For more details, see:
+# https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
+
+7c44d41878b36b6f058ba448a4762757c3b4c0da  # initial autoformat with black

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve python-rasterstats
+title: ""
+labels: ''
+assignees: ''
+
+---
+
+Welcome to the `python-rasterstats` issue tracker. Thanks for putting together a bug report! By following the template below, we'll be better able to reproduce the problem on our end.
+
+If you don't have a bug specifically but a general support question, please visit https://gis.stackexchange.com/
+
+**Describe the bug**
+A clear and concise description of what the bug is. What you expected to happen vs. what did happen.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. How did you install rasterstats and its dependencies?
+2. What datasets are necessary to reproduce the bug? Please provide links to example data if necessary.
+3. What code is necessary to reproduce the bug? Provide the code directly below or provide links to it.
+
+```python
+# Code to reproduce the error
+```
+
+**Feature Requests**
+
+`python-rasterstats` is not currently accepting any feature requests via the issue tracker. If you'd like to add a backwards-compatible feature, please open a pull request - it doesn't need to be 100% ready but should include a working proof-of-concept, tests, and should not break the existing API.

.github/workflows/test-rasterstats.yml

@@ -0,0 +1,26 @@
+name: Rasterstats Python package
+
+on:
+  pull_request:
+  push:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install pip --upgrade
+        python -m pip install -e ".[dev]"
+    - name: Test all packages
+      run: |
+        pytest

.gitignore

@@ -17,3 +17,7 @@ Vagrantfile
 venv
 .eggs
 .cache
+
+# no uv lockfile until this is fixed:
+# https://github.com/astral-sh/uv/issues/10845
+uv.lock

CHANGELOG.txt

@@ -1,3 +1,50 @@
+0.20.0
+- Progress bar for interactive use (#300)
+- Fixes to support Fiona 1.10 (#301)
+- Drop Python 3.8 support, 3.9+ is the minimum version
+
+0.19.0
+- Drop Python 2 support, Python 3 style updates #283
+- Sort imports #284
+- Add support for Fiona>1.9 #287
+
+0.18.0
+- Move project metadata to pyproject.toml #277
+- Black formatting #278
+- Don't cast integers to int64, use numpy accumulator dtype #279
+- Warn about nodata only once, io.NodataWarning type #280
+
+0.17.1
+- Fixes to keep up with recent versions of dependencies: #275 fiona, #266 shapely, #264 click
+- Added a pyproject.toml #265
+- Added CI testing for python 3.7 through 3.11
+
+0.17.0
+- Fix performance regression due to platform.architecture performance #258
+
+0.16.0
+- Fix deprecation warning with shapely 1.8+ #250
+
+0.15.0
+- Fix deprecation warning with Affine #211
+- Avoid unnecessary memory copy operation #213
+
+0.14.0
+- Add support return statement to zone_func #203
+- Take into account per dataset mask #198
+- Accessing geometry properties for user-defined stats #193
+- Updated method calls for numpy v1.16 #184
+
+0.13.1
+- Bug fix for io.read_features with Fiona 1.8+
+
+0.13.0
+- Require Rasterio>=1.0
+- Fix buffer logic for boxify_points (#171)
+
+0.12.1
+- Cast all integer data to int64 if we're on a 64 bit platform (#159)
+
 0.12.0
 - zone_func argument to apply a function to the masked array before computing stats
 - support shapely 1.6 exceptions
@@ -21,7 +68,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

README.rst

@@ -2,17 +2,16 @@ rasterstats
 ===========
 
 |BuildStatus|_
-|CoverageStatus|_
 
 ``rasterstats`` is a Python module for summarizing geospatial raster datasets based on vector geometries.
 It includes functions for **zonal statistics** and interpolated **point queries**. The command-line interface allows for
-easy interoperability with other GeoJSON tools. 
+easy interoperability with other GeoJSON tools.
 
 Documentation
 -------------
 For details on installation and usage, visit the documentation at `http://pythonhosted.org/rasterstats <http://pythonhosted.org/rasterstats/>`_.
 
-What does it do? 
+What does it do?
 ----------------
 Given a vector layer and a raster band, calculate the summary statistics of each vector geometry.
 For example, with a polygon vector layer and a digital elevation model (DEM) raster, compute the
@@ -25,39 +24,39 @@ mean elevation of each polygon.
 Command Line Quick Start
 ------------------------
 
-The command line interfaces to zonalstats and point_query 
+The command line interfaces to zonalstats and point_query
 are `rio` subcommands which read and write geojson features
 
 .. code-block:: bash
 
-    $ fio cat polygon.shp | rio zonalstats -r elevation.tif 
+    $ fio cat polygon.shp | rio zonalstats -r elevation.tif
 
     $ fio cat points.shp | rio pointquery -r elevation.tif
 
 See the `CLI Docs <http://pythonhosted.org/rasterstats/cli.html>`_. for more detail.
 
 Python Quick Start
------------
+------------------
 
 For zonal statistics
 
 .. code-block:: python
 
     >>> from rasterstats import zonal_stats
-    >>> stats = zonal_stats("tests/data/polygons.shp", "tests/data/elevation.tif")
-    >>> stats[1].keys()
-    ['count', 'min', 'max', 'mean']
+    >>> stats = zonal_stats("tests/data/polygons.shp", "tests/data/slope.tif")
+    >>> stats[0].keys()
+    dict_keys(['min', 'max', 'mean', 'count'])
     >>> [f['mean'] for f in stats]
-    [756.6057470703125, 114.660084635416666]
+    [14.660084635416666, 56.60576171875]
 
 and for point queries
 
 .. code-block:: python
 
     >>> from rasterstats import point_query
-    >>> point = "POINT(245309 1000064)"
-    >>> point_query(point, "tests/data/elevation.tif")
-    [723.9872347624]
+    >>> point = {'type': 'Point', 'coordinates': (245309.0, 1000064.0)}
+    >>> point_query(point, "tests/data/slope.tif")
+    [74.09817594635244]
 
 
 Issues
@@ -69,8 +68,5 @@ Find a bug? Report it via github issues by providing
 - python code or command to reproduce the error
 - information on your environment: versions of python, gdal and numpy and system memory
 
-.. |BuildStatus| image:: https://api.travis-ci.org/perrygeo/python-rasterstats.svg
-.. _BuildStatus: https://travis-ci.org/perrygeo/python-rasterstats
-
-.. |CoverageStatus| image:: https://coveralls.io/repos/github/perrygeo/python-rasterstats/badge.svg?branch=master
-.. _CoverageStatus: https://coveralls.io/github/perrygeo/python-rasterstats?branch=master
+.. |BuildStatus| image:: https://github.com/perrygeo/python-rasterstats/workflows/Rasterstats%20Python%20package/badge.svg
+.. _BuildStatus: https://github.com/perrygeo/python-rasterstats/actions

docs/cli.rst

@@ -85,7 +85,7 @@ for performing zonal statistics and point_queries at the command line.
 Example
 -----------
 
-In the following examples we use a polygon shapefile representing countries (``countries.shp``) and a raster digitial elevation model (``dem.tif``). The data are assumed to be in the same spatial reference system.
+In the following examples we use a polygon shapefile representing countries (``countries.shp``) and a raster digital elevation model (``dem.tif``). The data are assumed to be in the same spatial reference system.
 
 GeoJSON inputs
 ^^^^^^^^^^^^^^
@@ -97,7 +97,7 @@ This will print the GeoJSON Features to the terminal (stdout) with Features like
 
     {"type": Feature, "geometry": {...} ,"properties": {...}}
 
-We'll use unix pipes to pass this data directly into our zonal stats command without an intemediate file.
+We'll use unix pipes to pass this data directly into our zonal stats command without an intermediate file.
 
 Specifying the Raster
 ^^^^^^^^^^^^^^^^^^^^^