Skip to content

Commit

Permalink
Merge branch 'OSGeo:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
a0x8o authored Feb 3, 2025
2 parents 71534fb + d890cbc commit 918585d
Show file tree
Hide file tree
Showing 170 changed files with 2,651 additions and 1,092 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fuzz-seconds: 600
dry-run: false
- name: Upload Crash
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

doxygen:
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set up Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
with:
python-version: 3.8
- name: Install lint tool
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
- name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set up Python
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
with:
python-version: 3.8
- name: Check cmakelist
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
# We do that after running CMake to avoid CodeQL to trigger during CMake time,
# in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
- name: Initialize CodeQL
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -129,6 +129,6 @@ jobs:
cmake --build build -j$(nproc)
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
source ../ci/travis/conda/compile.sh
working-directory: ./gdal-feedstock

- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: ${{ matrix.platform }}-conda-package
path: ./gdal-feedstock/packages/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete_untagged_containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: github.repository == 'OSGeo/gdal'
steps:
- name: Delete all containers from gdal-deps without tags
uses: Chizkiyahu/delete-untagged-ghcr-action@1c77a06b7f80ad4beb82b85919003831d47277d1 # v5.0.0
uses: Chizkiyahu/delete-untagged-ghcr-action@4a33ce3cf2456d2aef98a1b6c60a12dad56cffd9 # v6.0.0
with:
token: ${{ secrets.PAT_TOKEN_DELETE_UNTAGGED_CONTAINERS }}
repository_owner: ${{ github.repository_owner }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ jobs:
${TEST_CMD}
- name: Coveralls
uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 # v2.3.4
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
if: ${{ matrix.id == 'coverage' }}
with:
format: lcov
Expand All @@ -378,14 +378,14 @@ jobs:
docker push ${CONTAINER_NAME_FULL}
- name: Upload coverage artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: ${{ matrix.id == 'coverage' }}
with:
name: coverage_index.html
path: build-${{ matrix.id }}/coverage_html/index.html

- name: Upload coverage artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: ${{ matrix.id == 'coverage' }}
with:
name: HTML
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
sarif_file: results.sarif
32 changes: 16 additions & 16 deletions .github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+v): Virtual Raster (*.vrt)
Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update, v:virtual-I/O s:subdatasets)
VRT -raster,multidimensional raster- (rw+uv): Virtual Raster (*.vrt)
DERIVED -raster- (ro): Derived datasets using VRT pixel functions
GTI -raster- (rov): GDAL Raster Tile Index (*.gti.gpkg, *.gti.fgb, *.gti)
SNAP_TIFF -raster- (rov): Sentinel Application Processing GeoTIFF
GTiff -raster- (rw+vs): GeoTIFF (*.tif, *.tiff)
GTiff -raster- (rw+uvs): GeoTIFF (*.tif, *.tiff)
COG -raster- (wv): Cloud optimized GeoTIFF generator (*.tif, *.tiff)
LIBERTIFF -raster- (rov): GeoTIFF (using LIBERTIFF library) (*.tif, *.tiff)
NITF -raster- (rw+vs): National Imagery Transmission Format (*.ntf)
NITF -raster- (rw+uvs): National Imagery Transmission Format (*.ntf)
RPFTOC -raster- (rovs): Raster Product Format TOC format (*.toc)
ECRGTOC -raster- (rovs): ECRG TOC format (*.xml)
HFA -raster- (rw+v): Erdas Imagine Images (.img) (*.img)
HFA -raster- (rw+uv): Erdas Imagine Images (.img) (*.img)
SAR_CEOS -raster- (rov): CEOS SAR Image
CEOS -raster- (rov): CEOS Image
JAXAPALSAR -raster- (rov): JAXA PALSAR Product Reader (Level 1.1/1.5)
Expand Down Expand Up @@ -37,20 +37,20 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
AirSAR -raster- (rov): AirSAR Polarimetric Image
RS2 -raster- (rovs): RadarSat 2 XML Product
SAFE -raster- (rov): Sentinel-1 SAR SAFE Product
PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
PCRaster -raster- (rw+): PCRaster Raster File (*.map)
ILWIS -raster- (rw+v): ILWIS Raster Map (*.mpr, *.mpl)
SGI -raster- (rw+v): SGI Image File Format 1.0 (*.rgb)
SRTMHGT -raster- (rwv): SRTMHGT File Format (*.hgt)
Leveller -raster- (rw+v): Leveller heightfield (*.ter)
Terragen -raster- (rw+v): Terragen heightfield (*.ter)
netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
netCDF -raster,multidimensional raster,vector- (rw+uvs): Network Common Data Format (*.nc)
HDF4 -raster,multidimensional raster- (ros): Hierarchical Data Format Release 4 (*.hdf)
HDF4Image -raster- (rw+): HDF4 Dataset
ISIS3 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 3) (*.lbl, *.cub)
ISIS2 -raster- (rw+v): USGS Astrogeology ISIS cube (Version 2)
PDS -raster- (rov): NASA Planetary Data System
PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
VICAR -raster,vector- (rw+v): MIPL VICAR file
TIL -raster- (rov): EarthWatch .TIL
ERS -raster- (rw+v): ERMapper .ers Labelled (*.ers)
Expand All @@ -73,7 +73,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
MAP -raster- (rov): OziExplorer .MAP
KMLSUPEROVERLAY -raster- (rwv): Kml Super Overlay (*.kml, *.kmz)
WEBP -raster- (rwv): WEBP (*.webp)
PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
Rasterlite -raster- (rwvs): Rasterlite (*.sqlite)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
PLMOSAIC -raster- (ro): Planet Labs Mosaics API
Expand Down Expand Up @@ -104,7 +104,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
SNODAS -raster- (rov): Snow Data Assimilation System (*.hdr)
KRO -raster- (rw+v): KOLOR Raw (*.kro)
ROI_PAC -raster- (rw+v): ROI_PAC raster
RRASTER -raster- (rw+v): R Raster (*.grd)
RRASTER -raster- (rw+uv): R Raster (*.grd)
BYN -raster- (rw+v): Natural Resources Canada's Geoid (*.byn, *.err)
NOAA_B -raster- (rov): NOAA GEOCON/NADCON5 .b format (*.b)
NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
Expand Down Expand Up @@ -143,16 +143,16 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
STACTA -raster- (rovs): Spatio-Temporal Asset Catalog Tiled Assets (*.json)
STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
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 FileGeodatabase (using OpenFileGDB) (*.gdb)
GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+uv): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
OpenFileGDB -raster,vector- (rw+uv): 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
GenBin -raster- (rov): Generic Binary (.hdr Labelled)
ENVI -raster- (rw+v): ENVI .hdr Labelled
EHdr -raster- (rw+v): ESRI .hdr Labelled (*.bil)
ENVI -raster- (rw+uv): ENVI .hdr Labelled
EHdr -raster- (rw+uv): ESRI .hdr Labelled (*.bil)
ISCE -raster- (rw+v): ISCE raster
Zarr -raster,multidimensional raster- (rw+vs): Zarr
Zarr -raster,multidimensional raster- (rw+uvs): Zarr
RCM -raster- (rovs): Radarsat Constellation Mission XML Product
HTTP -raster,vector- (ro): HTTP Fetching Wrapper
40 changes: 20 additions & 20 deletions .github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subdatasets)
Supported Formats: (ro:read-only, rw:read-write, +:write from scratch, u:update, v:virtual-I/O s:subdatasets)
FITS -raster,vector- (rw+): Flexible Image Transport System (*.fits)
PCIDSK -raster,vector- (rw+v): PCIDSK Database File (*.pix)
netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format (*.nc)
PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4 (*.xml)
PCIDSK -raster,vector- (rw+uv): PCIDSK Database File (*.pix)
netCDF -raster,multidimensional raster,vector- (rw+uvs): Network Common Data Format (*.nc)
PDS4 -raster,vector- (rw+uvs): NASA Planetary Data System 4 (*.xml)
VICAR -raster,vector- (rw+v): MIPL VICAR file
JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on JP2OpenJPEG library (*.jp2, *.j2k)
PDF -raster,vector- (rw+vs): Geospatial PDF (*.pdf)
PDF -raster,vector- (rw+uvs): Geospatial PDF (*.pdf)
MBTiles -raster,vector- (rw+v): MBTiles (*.mbtiles)
BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid (*.bag)
EEDA -vector- (ro): Earth Engine Data API
OGCAPI -raster,vector- (rov): OGCAPI
ESRI Shapefile -vector- (rw+v): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
MapInfo File -vector- (rw+v): MapInfo File (*.tab, *.mif, *.mid)
ESRI Shapefile -vector- (rw+uv): ESRI Shapefile (*.shp, *.dbf, *.shz, *.shp.zip)
MapInfo File -vector- (rw+uv): MapInfo File (*.tab, *.mif, *.mid)
UK .NTF -vector- (rov): UK .NTF
LVBAG -vector- (rov): Kadaster LV BAG Extract 2.0 (*.xml)
OGR_SDTS -vector- (rov): SDTS
S57 -vector- (rw+v): IHO S-57 (ENC) (*.000)
DGN -vector- (rw+v): Microstation DGN (*.dgn)
OGR_VRT -vector- (rov): VRT - Virtual Datasource (*.vrt)
Memory -vector- (rw+): Memory
CSV -vector- (rw+v): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
CSV -vector- (rw+uv): Comma Separated Value (.csv) (*.csv, *.tsv, *.psv)
NAS -vector- (rov): NAS - ALKIS (*.xml)
GML -vector- (rw+v): Geography Markup Language (GML) (*.gml, *.xml)
GPX -vector- (rw+v): GPX (*.gpx)
LIBKML -vector- (rw+v): Keyhole Markup Language (LIBKML) (*.kml, *.kmz)
LIBKML -vector- (rw+uv): Keyhole Markup Language (LIBKML) (*.kml, *.kmz)
KML -vector- (rw+v): Keyhole Markup Language (KML) (*.kml)
GeoJSON -vector- (rw+v): GeoJSON (*.json, *.geojson)
GeoJSON -vector- (rw+uv): GeoJSON (*.json, *.geojson)
GeoJSONSeq -vector- (rw+v): GeoJSON Sequence (*.geojsonl, *.geojsons)
ESRIJSON -vector- (rov): ESRIJSON (*.json)
TopoJSON -vector- (rov): TopoJSON (*.json, *.topojson)
Interlis 1 -vector- (rov): Interlis 1 (*.itf, *.ili)
Interlis 2 -vector- (rov): Interlis 2 (*.xtf, *.xml, *.ili)
OGR_GMT -vector- (rw+v): GMT ASCII Vectors (.gmt) (*.gmt)
GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
GPKG -raster,vector- (rw+uvs): GeoPackage (*.gpkg, *.gpkg.zip)
SQLite -raster,vector- (rw+uv): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
ODBC -vector- (ro): Open Database Connectivity (ODBC) (*.mdb, *.accdb)
WAsP -vector- (rw+v): WAsP .map format (*.map)
PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
MSSQLSpatial -vector- (rw+u): Microsoft SQL Server Spatial Database (BCP)
OGR_OGDI -vector- (ro): OGDI Vectors (VPF, VMAP, DCW)
PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
MySQL -vector- (rw+): MySQL
OCI -vector- (rw+): Oracle Spatial
OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
PostgreSQL -vector- (rw+u): PostgreSQL/PostGIS
MySQL -vector- (rw+u): MySQL
OCI -vector- (rw+u): Oracle Spatial
OpenFileGDB -raster,vector- (rw+uv): 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)
Expand All @@ -61,8 +61,8 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
SVG -vector- (rov): Scalable Vector Graphics (*.svg)
Idrisi -vector- (rov): Idrisi Vector (.vct) (*.vct)
XLS -vector- (ro): MS Excel format (*.xls)
ODS -vector- (rw+v): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
XLSX -vector- (rw+v): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
ODS -vector- (rw+uv): Open Document/ LibreOffice / OpenOffice Spreadsheet (*.ods)
XLSX -vector- (rw+uv): MS Office Open XML spreadsheet (*.xlsx, *.xlsm)
Elasticsearch -vector- (rw+): Elastic Search
Carto -vector- (rw+): Carto
AmigoCloud -vector- (rw+): AmigoCloud
Expand All @@ -71,7 +71,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
JML -vector- (rw+v): OpenJUMP JML (*.jml)
PLSCENES -raster,vector- (ro): Planet Labs Scenes API
CSW -vector- (ro): OGC CSW (Catalog Service for the Web)
MongoDBv3 -vector- (ro): MongoDB (using libmongocxx v3 client)
MongoDBv3 -vector- (rou): MongoDB (using libmongocxx v3 client)
VDV -vector- (rw+v): VDV-451/VDV-452/INTREST Data Format (*.txt, *.x10)
GMLAS -vector- (rwv): Geography Markup Language (GML) driven by application schemas (*.gml, *.xml)
MVT -vector- (rw+v): Mapbox Vector Tiles (*.mvt, *.mvt.gz, *.pbf)
Expand Down
Loading

0 comments on commit 918585d

Please sign in to comment.