From bcfb9cc5066bc17139adbab5347a90ecc7634cf8 Mon Sep 17 00:00:00 2001
From: snowman2 <alansnow21@gmail.com>
Date: Fri, 22 Dec 2023 10:21:05 -0600
Subject: [PATCH] TST: Update to GDAL 3.6-3.8

---
 .github/workflows/tests.yaml             | 11 +++--------
 Dockerfile                               |  4 ++--
 test/integration/test_integration__io.py |  4 ----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d60854d4..143d07ca 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -37,28 +37,23 @@ jobs:
         xarray-version: ['']
         pandas-version: ['']
         run-with-scipy: ['YES']
-        gdal-version: ['3.6.4']
+        gdal-version: ['3.8.2']
         include:
           - python-version: '3.10'
             rasterio-version: ''
             xarray-version: '==0.17'
             pandas-version: '<2'
             run-with-scipy: 'YES'
-            gdal-version: '3.4.3'
+            gdal-version: '3.6.4'
           - python-version: '3.10'
             rasterio-version: ''
             xarray-version: ''
             pandas-version: ''
             run-with-scipy: 'NO'
-            gdal-version: '3.5.3'
+            gdal-version: '3.7.3'
     steps:
       - uses: actions/checkout@v4
 
-      - name: Remove unused apt repo
-        if: ${{ matrix.gdal-version }} == '3.5.3'
-        run: |
-          rm -f /etc/apt/sources.list.d/apache-arrow.sources
-
       - name: Update
         run: |
           apt-get update
diff --git a/Dockerfile b/Dockerfile
index 31eb4ab4..88073571 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG GDAL=ubuntu-full-3.6.4
+ARG GDAL=ubuntu-full-3.8.2
 FROM ghcr.io/osgeo/gdal:${GDAL}
-ARG PYTHON_VERSION="3.10"
+ARG PYTHON_VERSION="3.12"
 ENV LANG="C.UTF-8"
 ENV LC_ALL="C.UTF-8"
 ENV PIP_NO_BINARY="rasterio"
diff --git a/test/integration/test_integration__io.py b/test/integration/test_integration__io.py
index 3b322c86..b37df614 100644
--- a/test/integration/test_integration__io.py
+++ b/test/integration/test_integration__io.py
@@ -1230,10 +1230,6 @@ def test_nc_attr_loading(open_rasterio):
         assert str(rds.time.values[1]) == "2016-12-29 12:52:42.347451"
 
 
-@pytest.mark.xfail(
-    version.parse(rasterio.__gdal_version__) < version.parse("3.0.4"),
-    reason="This was fixed in GDAL 3.0.4",
-)
 def test_nc_attr_loading__disable_decode_times(open_rasterio):
     with open_rasterio(
         os.path.join(TEST_INPUT_DATA_DIR, "PLANET_SCOPE_3D.nc"), decode_times=False