Merge pull request #886

Author: snowman2

.github/workflows/tests.yaml

@@ -38,7 +38,7 @@ jobs:
         rasterio-version: ['']
         xarray-version: ['']
         run-with-scipy: ['YES']
-        gdal-version: ['3.10.3']
+        gdal-version: ['3.12.0']
         include:
           - python-version: '3.12'
             rasterio-version: ''
@@ -48,8 +48,23 @@ jobs:
           - python-version: '3.12'
             rasterio-version: ''
             xarray-version: ''
-            run-with-scipy: 'NO'
+            run-with-scipy: 'YES'
             gdal-version: '3.9.3'
+          - python-version: '3.12'
+            rasterio-version: ''
+            xarray-version: ''
+            run-with-scipy: 'YES'
+            gdal-version: '3.10.3'
+          - python-version: '3.12'
+            rasterio-version: ''
+            xarray-version: ''
+            run-with-scipy: 'YES'
+            gdal-version: '3.11.5'
+          - python-version: '3.12'
+            rasterio-version: ''
+            xarray-version: ''
+            run-with-scipy: 'NO'
+            gdal-version: '3.11.5'
     steps:
       - uses: actions/checkout@v6
 
@@ -107,7 +122,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-15-intel, windows-latest]
         python-version: ['3.12', '3.13', '3.14']
-        gdal-version: ['3.10.3']
+        gdal-version: ['*']
         rasterio-version: ['*']
         xarray-version: ['*']
         run-with-scipy: ['YES']

test/conftest.py

@@ -18,6 +18,7 @@
 GDAL_GE_36 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.0")
 GDAL_GE_361 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.1")
 GDAL_GE_364 = version.parse(rasterio.__gdal_version__) >= version.parse("3.6.4")
+GDAL_GE_3_11 = version.parse(rasterio.__gdal_version__) >= version.parse("3.11.0")
 
 
 # xarray.testing.assert_equal(input_xarray, compare_xarray)

test/integration/test_integration__io.py

@@ -30,6 +30,7 @@
 from rioxarray._io import build_subdataset_filter
 from rioxarray.rioxarray import DEFAULT_GRID_MAP
 from test.conftest import (
+    GDAL_GE_3_11,
     GDAL_GE_36,
     GDAL_GE_364,
     TEST_COMPARE_DATA_DIR,
@@ -976,7 +977,26 @@ def test_rasterio_vrt_with_src_crs():
                     assert rds.rio.crs == src_crs
 
 
-def test_rasterio_vrt_gcps(tmp_path):
+@pytest.mark.parametrize(
+    "affine_c_param",
+    [
+        pytest.param(
+            115698.25,
+            marks=pytest.mark.skipif(
+                GDAL_GE_3_11,
+                reason="GDAL 3.10 and earlier used METHOD=GCP_POLYNOMIAL by default",
+            ),
+        ),
+        pytest.param(
+            115698.0,
+            marks=pytest.mark.skipif(
+                not GDAL_GE_3_11,
+                reason="GDAL 3.11+ uses METHOD=GCP_HOMOGRAPHY by default if 4 or 5 GCPs (https://github.com/OSGeo/gdal/pull/11949)",
+            ),
+        ),
+    ],
+)
+def test_rasterio_vrt_gcps(tmp_path, affine_c_param):
     tiffname = tmp_path / "test.tif"
     src_gcps = [
         GroundControlPoint(row=0, col=0, x=156113, y=2818720, z=0),
@@ -1008,7 +1028,7 @@ def test_rasterio_vrt_gcps(tmp_path):
                     Affine(
                         216.8587081056465,
                         0.0,
-                        115698.25,
+                        affine_c_param,
                         0.0,
                         -216.8587081056465,
                         2818720.0,

test/integration/test_integration_rioxarray.py

@@ -30,6 +30,7 @@
 )
 from rioxarray.rioxarray import _generate_spatial_coords, _make_coords
 from test.conftest import (
+    GDAL_GE_3_11,
     GDAL_GE_361,
     TEST_COMPARE_DATA_DIR,
     TEST_INPUT_DATA_DIR,
@@ -1170,7 +1171,26 @@ def test_reproject__no_nodata_masked(modis_reproject):
         _assert_xarrays_equal(mds_repr, mdc)
 
 
-def test_reproject__gcps_kwargs(tmp_path):
+@pytest.mark.parametrize(
+    "affine_c_param",
+    [
+        pytest.param(
+            115698.25,
+            marks=pytest.mark.skipif(
+                GDAL_GE_3_11,
+                reason="GDAL 3.10 and earlier used METHOD=GCP_POLYNOMIAL by default",
+            ),
+        ),
+        pytest.param(
+            115698.0,
+            marks=pytest.mark.skipif(
+                not GDAL_GE_3_11,
+                reason="GDAL 3.11+ uses METHOD=GCP_HOMOGRAPHY by default if 4 or 5 GCPs (https://github.com/OSGeo/gdal/pull/11949)",
+            ),
+        ),
+    ],
+)
+def test_reproject__gcps_kwargs(tmp_path, affine_c_param):
     tiffname = tmp_path / "test.tif"
     src_gcps = [
         GroundControlPoint(row=0, col=0, x=156113, y=2818720, z=0),
@@ -1203,7 +1223,7 @@ def test_reproject__gcps_kwargs(tmp_path):
             Affine(
                 216.8587081056465,
                 0.0,
-                115698.25,
+                affine_c_param,
                 0.0,
                 -216.8587081056465,
                 2818720.0,
@@ -3222,7 +3242,26 @@ def test_rio_get_gcps(with_z):
         assert gcp.info == gdal_gcp.info
 
 
-def test_reproject__gcps_file(tmp_path):
+@pytest.mark.parametrize(
+    "affine_c_param",
+    [
+        pytest.param(
+            115698.25,
+            marks=pytest.mark.skipif(
+                GDAL_GE_3_11,
+                reason="GDAL 3.10 and earlier used METHOD=GCP_POLYNOMIAL by default",
+            ),
+        ),
+        pytest.param(
+            115698.0,
+            marks=pytest.mark.skipif(
+                not GDAL_GE_3_11,
+                reason="GDAL 3.11+ uses METHOD=GCP_HOMOGRAPHY by default if 4 or 5 GCPs (https://github.com/OSGeo/gdal/pull/11949)",
+            ),
+        ),
+    ],
+)
+def test_reproject__gcps_file(tmp_path, affine_c_param):
     tiffname = tmp_path / "test.tif"
     src_gcps = [
         GroundControlPoint(row=0, col=0, x=156113, y=2818720, z=0),
@@ -3253,7 +3292,7 @@ def test_reproject__gcps_file(tmp_path):
             Affine(
                 216.8587081056465,
                 0.0,
-                115698.25,
+                affine_c_param,
                 0.0,
                 -216.8587081056465,
                 2818720.0,