[Git][debian-gis-team/rasterio][master] Add upstream patch to use GTiff driver with GDAL 3.6.0.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / rasterio


Commits:
435f5ab4 by Bas Couwenberg at 2022-11-08T06:28:33+01:00
Add upstream patch to use GTiff driver with GDAL 3.6.0.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/gdal-3.6.0.patch
- + debian/patches/pr2634-ensure-default-driver-for-tif-to-be-GTiff.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+rasterio (1.3.3-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add upstream patch to use GTiff driver with GDAL 3.6.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Nov 2022 05:47:31 +0100
+
 rasterio (1.3.3-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/gdal-3.6.0.patch
=====================================
@@ -4,26 +4,6 @@ Bug: https://github.com/rasterio/rasterio/issues/2632
 Bug-Debian: https://bugs.debian.org/1023480
 Forwarded: not-needed
 
---- a/tests/test_dataset.py
-+++ b/tests/test_dataset.py
-@@ -82,6 +82,7 @@ def test_statistics(path_rgb_byte_tif):
-         assert_almost_equal(stats.std, 52.340921626611)
- 
- 
-+ at pytest.mark.xfail(strict=False, reason='Fails with GDAL 3.6.0')
- @pytest.mark.parametrize("blockysize", [1, 2, 3, 7, 61, 62])
- def test_creation_untiled_blockysize(tmp_path, blockysize):
-     """Check for fix of gh-2599"""
---- a/tests/test_shutil.py
-+++ b/tests/test_shutil.py
-@@ -65,6 +65,7 @@ def test_copy_fail_same_dataset(data):
-             rasterio.shutil.copy(src, path, **src.profile)
- 
- 
-+ at pytest.mark.xfail(strict=False, reason='Fails with GDAL 3.6.0')
- @pytest.mark.parametrize("pass_handle", (True, False))
- def test_copy(tmpdir, path_rgb_byte_tif, pass_handle):
- 
 --- a/tests/test_warp.py
 +++ b/tests/test_warp.py
 @@ -1191,6 +1191,7 @@ def test_transform_geom__geo_interface__
@@ -42,13 +22,3 @@ Forwarded: not-needed
  @pytest.mark.parametrize("method", SUPPORTED_RESAMPLING)
  def test_reproject_resampling_alpha(method):
      """Reprojection of a source with alpha band succeeds"""
---- a/tests/test_write.py
-+++ b/tests/test_write.py
-@@ -398,6 +398,7 @@ def test_too_big_for_tiff(tmpdir):
-         rasterio.open(name, 'w', driver='GTiff', height=100000, width=100000, count=1, dtype='uint8', BIGTIFF=False)
- 
- 
-+ at pytest.mark.xfail(strict=False, reason='Fails with GDAL 3.6.0')
- @pytest.mark.parametrize("extension, driver", [
-     ('tif', 'GTiff'),
-     ('tiff', 'GTiff'),


=====================================
debian/patches/pr2634-ensure-default-driver-for-tif-to-be-GTiff.patch
=====================================
@@ -0,0 +1,19 @@
+Description: BUG: ensure default driver for tif to be GTiff
+Author: snowman2 <alansnow21 at gmail.com>
+Origin: https://github.com/rasterio/rasterio/pull/2634
+Bug: https://github.com/rasterio/rasterio/issues/2632
+
+--- a/rasterio/_base.pyx
++++ b/rasterio/_base.pyx
+@@ -148,6 +148,11 @@ def _raster_driver_extensions():
+ 
+         for extension in extensions.split():
+             driver_extensions[extension] = drivername
++
++    # ensure default driver for tif to be GTiff instead of COG
++    driver_extensions.update(
++        {'tif': 'GTiff', 'tiff': 'GTiff'}
++    )
+     return driver_extensions
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0001-Rename-rio-to-rasterio-Closes-788463.patch
+pr2634-ensure-default-driver-for-tif-to-be-GTiff.patch
 gdal-3.6.0.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/rasterio/-/commit/435f5ab4e46ab3ca7222388bfb44c662563c405c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/rasterio/-/commit/435f5ab4e46ab3ca7222388bfb44c662563c405c
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/20221108/36020fa7/attachment-0001.htm>