Merge remote-tracking branch 'upstream/master' into MiraMonVector-fix-stringlist,-integerlist,--case

Author: AbelPau

.github/workflows/cmake_builds.yml

@@ -218,6 +218,8 @@ jobs:
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install-gdal/lib
         $GITHUB_WORKSPACE/install-gdal/bin/gdalinfo --version
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
+        # Test fix for https://github.com/conda-forge/gdal-feedstock/issues/995
+        PYTHONWARNINGS="error" PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal"
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py
     - name: CMake with rpath
       run: |
@@ -431,7 +433,7 @@ jobs:
             cfitsio freexl geotiff libjpeg-turbo libpq libspatialite libwebp-base pcre pcre2 postgresql \
             sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \
             openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc libarchive \
-            arrow-cpp pyarrow libaec libheif libavif cmake
+            arrow-cpp pyarrow libaec libheif libavif cmake fsspec
     - name: Check CMake version
       shell: bash -l {0}
       run: |

.github/workflows/fedora_rawhide/build.sh

@@ -10,7 +10,17 @@ cmake ${GDAL_SOURCE_DIR:=..} \
   -DCMAKE_CXX_FLAGS="-std=c++20 -Werror -O1 -D_FORTIFY_SOURCE=2" \
   -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
   -DUSE_CCACHE=ON \
+  -DEMBED_RESOURCE_FILES=ON \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DWERROR_DEV_FLAG="-Werror=dev"
 make -j$(nproc)
 make -j$(nproc) install DESTDIR=/tmp/install-gdal
+
+ctest -V -j $(nproc)
+
+rm -rf data
+cmake ${GDAL_SOURCE_DIR:=..} \
+  -DUSE_ONLY_EMBEDDED_RESOURCE_FILES=ON
+rm -rf /tmp/install-gdal
+make -j$(nproc)
+make -j$(nproc) install DESTDIR=/tmp/install-gdal

.github/workflows/linux_build.yml

@@ -264,18 +264,31 @@ jobs:
         # FIXME the default BUILD_CMD here isn't working...we get an error
         # about the quotes not matching.
       - name: Build
+        env:
+          TRAVIS: yes
+          TRAVIS_BRANCH: ${{ matrix.travis_branch }}
+          BUILD_NAME: ${{ matrix.travis_branch }}
         run: |
           if test -f ".github/workflows/${{ matrix.id }}/${{ matrix.build_script }}"; then
             BUILD_CMD="$(pwd)/.github/workflows/${{ matrix.id }}/${{ matrix.build_script }}"
           else
             BUILD_CMD="sh -c 'cmake .. && make -j$(nproc)'"
           fi
 
+          # For cache
+          mkdir -p .gdal
+
           mkdir -p build-${{ matrix.id }}
           docker run --name gdal-build \
             --rm \
+            -e CI \
+            -e GITHUB_WORKFLOW \
+            -e TRAVIS \
+            -e TRAVIS_BRANCH \
+            -e BUILD_NAME \
             -e "GDAL_SOURCE_DIR=$(pwd)" \
             -u $(id -u ${USER}):$(id -g ${USER}) \
+            -v $(pwd)/.gdal:/.gdal:rw \
             -v $(pwd):$(pwd):rw \
             -v ${{ github.workspace }}/.ccache:/.ccache:rw \
             --workdir $(pwd)/build-${{ matrix.id }} \
@@ -322,7 +335,7 @@ jobs:
           fi
 
           # For cache
-          mkdir .gdal
+          mkdir -p .gdal
 
           docker run \
             -e CI \

.github/workflows/ubuntu_24.04/Dockerfile.ci

@@ -158,3 +158,25 @@ RUN python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt
 # cfchecker requires udunits2
 RUN apt-get install -y --allow-unauthenticated libudunits2-0 libudunits2-data
 RUN python3 -m pip install --break-system-packages cfchecker
+
+RUN python3 -m pip install --break-system-packages fsspec
+
+# Manually install ADBC packages from Ubuntu 22.04 as there are no 24.04 packages at time of writing.
+RUN curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake-dev_14-1_amd64.deb
+
+# Install libduckdb
+RUN curl -LO -fsS https://github.com/duckdb/duckdb/releases/download/v1.1.2/libduckdb-linux-amd64.zip \
+    && unzip libduckdb-linux-amd64.zip libduckdb.so \
+    && mv libduckdb.so /usr/lib/x86_64-linux-gnu \
+    && rm -f libduckdb-linux-amd64.zip

.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt

@@ -145,7 +145,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   JPEGXL -raster- (rwv): JPEG-XL (*.jxl)
   GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
   SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   PLSCENES -raster,vector- (ro): Planet Labs Scenes API
   NGW -raster,vector- (rw+s): NextGIS Web

.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt

@@ -42,7 +42,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
   MySQL -vector- (rw+): MySQL
   OCI -vector- (rw+): Oracle Spatial
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   FileGDB -vector- (rw+): ESRI FileGDB (*.gdb)
   DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
@@ -82,6 +82,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
   MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
   XODR -vector- (ro): OpenDRIVE - Open Dynamic Road Information for Vehicle Environment (*.xodr)
+  ADBC -vector- (ro): Arrow Database Connectivity
   TIGER -vector- (rov): U.S. Census TIGER/Line
   AVCBin -vector- (rov): Arc/Info Binary Coverage
   AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)

.github/workflows/windows_conda_expected_gdalinfo_formats.txt

@@ -144,7 +144,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
   NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
   GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   PLSCENES -raster,vector- (ro): Planet Labs Scenes API
   NGW -raster,vector- (rw+s): NextGIS Web

.github/workflows/windows_conda_expected_ogrinfo_formats.txt

@@ -39,7 +39,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
   MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
   PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
@@ -77,6 +77,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PMTiles -vector- (rw+v): ProtoMap Tiles (*.pmtiles)
   JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
   MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
+  ADBC -vector- (ro): Arrow Database Connectivity
   TIGER -vector- (rov): U.S. Census TIGER/Line
   AVCBin -vector- (rov): Arc/Info Binary Coverage
   AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)

.pre-commit-config.yaml

@@ -5,7 +5,8 @@ repos:
         -   id: black
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 autotest/ogr/data/
               )
     -   repo: https://github.com/timothycrosley/isort
@@ -14,7 +15,8 @@ repos:
         -   id: isort
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pycqa/flake8
@@ -23,7 +25,8 @@ repos:
         -   id: flake8
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 examples/|
                 autotest/ogr/data/
               )
@@ -54,6 +57,7 @@ repos:
                 frmts/grib/degrib/degrib|
                 frmts/grib/degrib/g2clib|
                 port/utf8.h|
+                ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h|
                 ogr/ogrsf_frmts/cad/libopencad/|
                 ogr/ogrsf_frmts/geojson/libjson/|
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|

NEWS.md

@@ -217,6 +217,8 @@ GTiff driver:
  * use main dataset GetSiblingFiles() for overviews
  * SRS writer: do not use EPSG:4326 if angular unit is not degree
  * make driver optional (but must be explicitly disabled)
+ * tif_jxl: writer: propagate DISTANCE/QUALITY setting to extra channel
+ * fix memory leak when trying to open COG in update mode
  * Internal libtiff: resync with upstream
 
 HEIF driver:
@@ -435,13 +437,16 @@ Zarr driver:
   when possible
 * Add OGRWKBTransform() for in-place coordinate transformation of WKB geometries
 * OGR_GreatCircle_ API: do not hardcode Earth radius
+* ogr_core.h: suppress warning when building with -Wpedantic for C < 23 (#2322)
 
 ### OGRSpatialReference
 
 * OGRSpatialReference::FindMatches(): improve when input SRS doesn't have
   expected axis order
 * OGRSpatialReference::EPSGTreatsAsLatLong()/EPSGTreatsAsNorthingEasting():
   remove the check on the EPSG authority
+* Add OSRGetAuthorityListFromDatabase() to get the list of CRS authorities used
+  in the PROJ database.
 
 ### Utilities
 
@@ -470,6 +475,7 @@ Arrow ecosystem:
  * Arrow/Parquet/generic arrow: add write support for arrow.json extension
  * Add a Arrow VSI file system (for libarrow >= 16.0) allowing to use GDAL
    VSI file systems as libarrow compatible file systems.
+ * Add (minimum) support for libarrow 18.0.0
 
 Arrow driver
  * add read support for StringView and BinaryView (but not in OGR generic Arrow
@@ -521,6 +527,7 @@ GPKG driver:
  * prevent from creating field with same name, or with the name of the geometry
    field
  * CreateField(): check we are not reaching the max number of fields
+ * SQLite/GPKG: turn on SQLite 'PRAGMA secure_delete=1' by default
 
 HANA driver:
  * Add support for REAL_VECTOR type (#10499)
@@ -607,6 +614,7 @@ WFS driver:
 ## SWIG bindings
 
 * Python/Java: replace sprintf() with snprintf() to avoid warnings on OSX
+* fix memleak in gdal.GetConfigOptions()
 
 ### Python bindings
 
@@ -623,6 +631,8 @@ WFS driver:
 * make MDArray.Write(array_of_strings) work with a 0-d string variable
 * Avoid linear scan in gdal_array.NumericTypeCodeToGDALTypeCode (#10694)
 * Dataset.Close(): invalidate children before closing dataset
+* __init__.py: remove calls to warnings.simplefilter() (#11140)
+* fix compatibility issue with SWIG 4.3.0 and PYTHONWARNINGS=error
 
 ### Java bindings