[Git][debian-gis-team/rasterio][upstream] New upstream version 1.3.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Aug 18 04:43:41 BST 2022
Bas Couwenberg pushed to branch upstream at Debian GIS Project / rasterio
Commits:
de4d648d by Bas Couwenberg at 2022-08-18T05:29:54+02:00
New upstream version 1.3.1
- - - - -
12 changed files:
- .github/workflows/tests.yaml
- AUTHORS.txt
- CHANGES.txt
- README.rst
- rasterio/__init__.py
- rasterio/_base.pyx
- rasterio/_io.pyx
- rasterio/sample.py
- setup.py
- tests/test_io.py
- tests/test_sampling.py
- tests/test_write.py
Changes:
=====================================
.github/workflows/tests.yaml
=====================================
@@ -2,7 +2,7 @@ name: Tests
on:
push:
- branches: [ master ]
+ branches: [ maint-1.3 ]
paths:
- '.github/workflows/tests.yaml'
- 'requirements*.txt'
@@ -14,7 +14,7 @@ on:
- 'rasterio/**'
- 'tests/**'
pull_request:
- branches: [ master ]
+ branches: [ maint-1.3 ]
paths:
- '.github/workflows/tests.yaml'
- 'requirements*.txt'
=====================================
AUTHORS.txt
=====================================
@@ -6,16 +6,19 @@ Authors
* Aldo Culquicondor
* Alessandro Amici
* Alex Shepherd
-* Alexander
* Alexander Ivanov
* Alfred-Mountfield
* Amit Kapadia
+* Andrea Giardini
* Andrew Annex
* Andrew Catellier
+* Andrew Nisbet
* Ariel Zerahia
+* Arno Gobbin
* AsgerPetersen
* Bas Couwenberg
* Ben Lewis
+* Bill Morris
* Brendan Ward
* Caleb Robinson
* Charlie Loyd
@@ -28,11 +31,14 @@ Authors
* Dan Baston
* Daniel J. H
* Darren Weber
+* David Hoese
* Denis Rykov
+* Dr Martin Black
* Elliott Sales de Andrade
* Erik Seglem
* Etienne B. Racine
* Even Rouault
+* Ewout ter Hoeven
* Felix Divo
* Filipe Fernandes
* Florian
@@ -41,7 +47,9 @@ Authors
* Gregory Raevski
* Guillaume Lostis
* Guy Doulberg
+* Howard Butler
* Ian Schneider
+* Idan Miara
* Ismail Sunni
* Jacques Tardie
* James Hiebert
@@ -55,7 +63,9 @@ Authors
* Jonas Sølvsteen
* Joris Van den Bossche
* Joshua Arnott
+* João Santos
* Juan Luis Cano Rodríguez
+* Keith Jenkins
* Kelsey Jordahl
* Kevin Wurster
* Kirill Kouzoubov
@@ -74,21 +84,27 @@ Authors
* Mike Taves
* Nat Wilson
* Nick Grue
+* Nico Mandery
* Nikolai Janakiev
* Norman Barker
+* Olivier Cloux
* Pablo Sanfilippo
* Patrick Young
* Pratik Yadav
* RK Aranas
* Raaj Tilak Sarma
+* RichardScottOZ
* Robert Sare
* Robin Wilson
* Ryan Grout
* Sam Murphy
+* Samuel Kogler
* Sean Gillies
* Seth Fitzsimmons
* Seth Miller
+* Steven Pestana
* Tim Gates
+* Tomáš Hrnčiar
* Trevor R.H. Clarke
* Tyler Erickson
* Vincent Sarago
@@ -106,4 +122,6 @@ Authors
* ljburtz
* morrme
* ngrue
+* ryan
* sshuair
+* ungarj
=====================================
CHANGES.txt
=====================================
@@ -1,6 +1,33 @@
Changes
=======
+1.3.1 (2022-08-17)
+------------------
+
+Packaging:
+
+Wheels for 1.3.1 are built using the version of rasterio-wheels dated
+2022-08-17 and include PROJ 9.0.1 and GDAL 3.5.1.
+
+Bug fixes:
+
+- get_data_window has been improved and extended to 1D (#2510).
+- Broadcasting of coordinates in transform.xy has been restored (#2538).
+- A bug in nodata filling (#2474) has been fixed by patching GDAL (wheels
+ only).
+- Support for PROJ_DATA has been added (#2530).
+- Non-informative errors arising from opening a dataset in write mode are
+ silenced (#2525).
+- N-D arrays are once again accepted by sampling.sample_gen (#2547).
+- MemoryDataset's memory layout has been fixed to properly support
+ non-contiguous data (#2512).
+
+1.3.0.post1 (2022-08-09)
+------------------------
+
+This version corrects errors made in building binary wheels for 1.3.0. There
+are no bug fixes or new features in this version.
+
1.3.0 (2022-07-05)
------------------
=====================================
README.rst
=====================================
@@ -9,7 +9,7 @@ Rasterio reads and writes geospatial raster data.
.. image:: https://coveralls.io/repos/github/mapbox/rasterio/badge.svg?branch=master
:target: https://coveralls.io/github/mapbox/rasterio?branch=master
-
+
.. image:: https://img.shields.io/pypi/v/rasterio
:target: https://pypi.org/project/rasterio/
@@ -17,11 +17,10 @@ Geographic information systems use GeoTIFF and other formats to organize and
store gridded, or raster, datasets. Rasterio reads and writes these formats and
provides a Python API based on N-D arrays.
-Rasterio 1.3 works with Python versions 3.8 through 3.10, Numpy versions 1.18
-and newer, and GDAL versions 3.1 through 3.4. Official binary packages for
-Linux and Mac OS X with most built-in format drivers plus HDF5, netCDF, and
-OpenJPEG2000 are available on PyPI. Unofficial binary packages for Windows are
-available through other channels.
+Rasterio 1.3 works with Python 3.8+, Numpy 1.18+, and GDAL 3.1+. Official
+binary packages for Linux, macOS, and Windows with most built-in format
+drivers plus HDF5, netCDF, and OpenJPEG2000 are available on PyPI. Unofficial
+binary packages for Windows are available through other channels.
Read the documentation for more details: https://rasterio.readthedocs.io/.
@@ -186,9 +185,9 @@ system set the variable as shown below.
Dependencies
------------
-Rasterio has a C library dependency: GDAL >= 2.3. GDAL itself depends on some
+Rasterio has a C library dependency: GDAL >= 3.1. GDAL itself depends on some
other libraries provided by most major operating systems and also depends on
-the non standard GEOS and PROJ4 libraries. How to meet these requirement will
+the non standard GEOS and PROJ libraries. How to meet these requirement will
be explained below.
Rasterio's Python dependencies are (see the package metadata file):
@@ -200,7 +199,7 @@ Rasterio's Python dependencies are (see the package metadata file):
certifi
click>=4.0
cligj>=0.5
- numpy
+ numpy>=1.18
snuggs>=1.4.1
click-plugins
setuptools
@@ -209,7 +208,7 @@ Rasterio's Python dependencies are (see the package metadata file):
hypothesis
pytest-cov>=2.2.0
matplotlib
- boto3>=1.3.1
+ boto3>=1.2.4
numpydoc
pytest>=2.8.2
shapely
@@ -232,10 +231,10 @@ Rasterio's Python dependencies are (see the package metadata file):
matplotlib
[s3]
- boto3>=1.3.1
+ boto3>=1.2.4
[test]
- boto3>=1.3.1
+ boto3>=1.2.4
hypothesis
packaging
pytest-cov>=2.2.0
=====================================
rasterio/__init__.py
=====================================
@@ -55,7 +55,7 @@ with rasterio._loading.add_gdal_dll_directories():
have_vsi_plugin = False
__all__ = ['band', 'open', 'pad', 'Env', 'CRS']
-__version__ = "1.3.0"
+__version__ = "1.3.1"
__gdal_version__ = gdal_version()
__proj_version__ = ".".join([str(version) for version in get_proj_version()])
__geos_version__ = ".".join([str(version) for version in get_geos_version()])
=====================================
rasterio/_base.pyx
=====================================
@@ -212,8 +212,8 @@ cdef GDALDatasetH open_dataset(
try:
return exc_wrap_pointer(hds)
finally:
- CSLDestroy(drivers)
- CSLDestroy(options)
+ CSLDestroy(drivers)
+ CSLDestroy(options)
cdef class DatasetBase:
=====================================
rasterio/_io.pyx
=====================================
@@ -16,6 +16,7 @@ import numpy as np
from rasterio._base import tastes_like_gdal
from rasterio._base cimport open_dataset
+from rasterio._env import catch_errors
from rasterio._err import (
GDALError, CPLE_OpenFailedError, CPLE_IllegalArgError, CPLE_BaseError, CPLE_AWSObjectNotFoundError, CPLE_HttpResponseError)
from rasterio.crs import CRS
@@ -271,7 +272,8 @@ cdef _delete_dataset_if_exists(path):
cdef const char *path_c = NULL
try:
- dataset = open_dataset(path, 0x40, None, None, None)
+ with catch_errors():
+ dataset = open_dataset(path, 0x40, None, None, None)
except (CPLE_OpenFailedError, CPLE_AWSObjectNotFoundError, CPLE_HttpResponseError) as exc:
log.debug("Skipped delete for overwrite, dataset does not exist: %r", path)
else:
=====================================
rasterio/sample.py
=====================================
@@ -58,7 +58,7 @@ def sample_gen(dataset, xy, indexes=None, masked=False):
nodata = np.ma.array(nodata, mask=mask)
for pts in _grouper(xy, 256):
- pts = zip(*filter(None, pts))
+ pts = zip(*filter(lambda x: x is not None, pts))
for row_off, col_off in zip(*rowcol(dt, *pts)):
if row_off < 0 or col_off < 0 or row_off >= height or col_off >= width:
=====================================
setup.py
=====================================
@@ -267,7 +267,7 @@ inst_reqs = [
"certifi",
"click>=4.0",
"cligj>=0.5",
- "numpy",
+ "numpy>=1.18",
"snuggs>=1.4.1",
"click-plugins",
"setuptools",
=====================================
tests/test_io.py
=====================================
@@ -6,7 +6,7 @@ from rasterio.io import DatasetReader, DatasetWriter
httpstif = (
- "https://github.com/rasterio/rasterio/blob/master/tests/data/float32.tif?raw=true"
+ "https://github.com/rasterio/rasterio/blob/main/tests/data/float32.tif?raw=true"
)
=====================================
tests/test_sampling.py
=====================================
@@ -50,3 +50,10 @@ def test_sampling_type():
with rasterio.open('tests/data/RGB.byte.tif') as src:
sampler = src.sample([(220650.0, 2719200.0)], indexes=[2])
assert type(sampler)
+
+
+def test_sampling_ndarray():
+ """sample and sample_gen can take ndarrays of coords."""
+ with rasterio.open('tests/data/RGB.byte.tif') as src:
+ data = next(src.sample(numpy.array([[220650.0, 2719200.0]])))
+ assert list(data) == [18, 25, 14]
=====================================
tests/test_write.py
=====================================
@@ -1,3 +1,4 @@
+import logging
import re
from pathlib import Path
import subprocess
@@ -523,7 +524,7 @@ def test_write_int64(tmp_path):
) as file:
file.write(data, [1])
assert file.dtypes == (rasterio.int64,)
-
+
with rasterio.open(test_file) as file:
assert file.dtypes == (rasterio.int64,)
@@ -546,3 +547,12 @@ def test_write_int64__unsupported(tmp_path):
dtype=data.dtype
) as file:
file.write(data, [1])
+
+
+def test_open_no_log(caplog, tmp_path):
+ """See gh-2525."""
+ caplog.set_level(logging.DEBUG)
+ rasterio.open(tmp_path / "my.tif", "w", driver="GTiff", width=500, height=500, count=4, dtype=np.uint8, nodata=255)
+ assert "GDAL signalled an error" not in caplog.text
+
+
View it on GitLab: https://salsa.debian.org/debian-gis-team/rasterio/-/commit/de4d648dad11060badf057a9f5d30acfde9ce4f8
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/rasterio/-/commit/de4d648dad11060badf057a9f5d30acfde9ce4f8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220818/97d9728f/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list