Skip to content

Commit 517f65a

Browse files
committed
Bring SD branch up to date.
1 parent c57e878 commit 517f65a

File tree

4,824 files changed

+393453
-264102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,824 files changed

+393453
-264102
lines changed

.github/ISSUE_TEMPLATE/10_bug_report.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ body:
1010
1111
The GDAL project is made of contributions from various individuals and organizations, each with their own focus. The issue you are facing is not necessarily in the priority list of those contributors and consequently there is no guarantee that it will be addressed in a timely manner. If this bug report or feature request is high-priority for you, and you cannot address it yourself, we suggest engaging a GDAL developer or support organisation and financially sponsoring a fix.
1212
13+
- type: markdown
14+
attributes:
15+
value: |
16+
17+
- [ ] I'm using LLM/AI-suggested procedures
18+
19+
Using GDAL still requires thinking. While LLMs can sometimes provide useful guidance about how to use GDAL, the most precise documentation is the source code itself, with the test suite being the next most useful place for discovering how to use a feature. Please tell us in the ticket if you are using LLM-suggested procedures.
20+
1321
- type: textarea
1422
id: what
1523
attributes:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ blank_issues_enabled: false
22

33
contact_links:
44

5+
- name: '"pip install GDAL" does not work'
6+
url: https://gdal.org/en/stable/download.html#conda
7+
about: >
8+
"pip install GDAL" only works if you have the development headers and
9+
library of the native libgdal matching the version of the GDAL python
10+
bindings you want to install. Which may not be easily found, in particular
11+
on Windows. We do not consider the lack of pip binary wheels as a defect.
12+
Our best suggestion is to recommend using GDAL Conda builds instead as
13+
documented at https://gdal.org/en/stable/download.html#conda
14+
515
- name: Question
616
url: https://gis.stackexchange.com/
717
about: >

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ More generally, consult [development practices](https://gdal.org/development/dev
2828

2929
## Tasklist
3030

31-
- [ ] ADD YOUR TASKS HERE
31+
- [ ] AI (Copilot or something similar) supported my development of this PR
3232
- [ ] Make sure code is correctly formatted (cf [pre-commit configuration](https://gdal.org/development/dev_practices.html#commit-hooks))
3333
- [ ] Add test case(s)
3434
- [ ] Add documentation
3535
- [ ] Updated Python API documentation (swig/include/python/docs/)
3636
- [ ] Review
3737
- [ ] Adjust for comments
3838
- [ ] All CI builds and checks have passed
39+
- [ ] ADD YOUR TASKS HERE
3940

4041
## Environment
4142

.github/workflows/alpine/Dockerfile.ci

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:edge
1+
FROM alpine:edge@sha256:732b6226a359f67fad4e38b34dd374bd62a6d282e20c493a38cc7d3a653f86ca
22

33
RUN apk add \
44
apache-arrow-dev \
@@ -22,6 +22,7 @@ RUN apk add \
2222
kealib-dev \
2323
libaec-dev \
2424
libarchive-dev \
25+
libavif-dev \
2526
libdeflate-dev \
2627
libgeotiff-dev \
2728
libheif-dev \
@@ -40,9 +41,9 @@ RUN apk add \
4041
lz4-dev \
4142
make \
4243
mariadb-connector-c-dev \
44+
muparser-dev \
4345
netcdf-dev \
4446
odbc-cpp-wrapper-dev \
45-
ogdi-dev \
4647
openexr-dev \
4748
openjpeg-dev \
4849
openssl-dev \
@@ -55,6 +56,7 @@ RUN apk add \
5556
py3-pyarrow-pyc \
5657
py3-numpy \
5758
py3-numpy-dev \
59+
py3-numpy-tests \
5860
py3-pip \
5961
py3-setuptools \
6062
python3-dev \
@@ -71,7 +73,7 @@ RUN apk add \
7173
zstd-dev
7274

7375
COPY requirements.txt /tmp/
74-
RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
76+
RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install --break-system-packages -U -r /tmp/requirements.txt
7577

7678
RUN apk add git autoconf automake libtool bison && \
7779
git clone --branch "${SWIG_GIT_TAG:-master}" --depth 1 https://github.com/swig/swig.git swig-git && \

.github/workflows/alpine/build.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ cmake ${GDAL_SOURCE_DIR:=..} \
2121
-DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \
2222
-DIconv_LIBRARY=/usr/lib/libiconv.so \
2323
-DADD_EXTERNAL_DEFERRED_PLUGIN_FOO=/tmp/foo.cpp \
24+
-DGDAL_ENABLE_PLUGINS=ON \
25+
-DGDAL_ENABLE_PLUGINS_NO_DEPS=ON \
26+
-DOGR_ENABLE_DRIVER_TAB_PLUGIN=OFF \
27+
-DOGR_ENABLE_DRIVER_GEOJSON_PLUGIN=OFF \
2428
-DCMAKE_CXX_STANDARD=23 \
2529
-DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS="-Werror" -DWERROR_DEV_FLAG="-Werror=dev"
2630
make -j$(nproc)
@@ -35,3 +39,25 @@ else
3539
echo "DeclareDeferredFOO() has NOT been run"
3640
exit 1
3741
fi
42+
43+
#
44+
echo "Validating gdal --json-usage output"
45+
apps/gdal --json-usage > out.json
46+
export PYTHON_CMD=python3
47+
$PYTHON_CMD -m venv myvenv
48+
source myvenv/bin/activate
49+
$PYTHON_CMD -m pip install -U check-jsonschema
50+
check-jsonschema --schemafile data/gdal_algorithm.schema.json out.json
51+
52+
# Check behavior when plugin not available
53+
mv gdalplugins/ogr_PG.so gdalplugins/ogr_PG.so.disabled
54+
export GDAL_DRIVER_PATH=$PWD/gdalplugins
55+
if apps/gdal vector convert -i autotest/ogr/data/poly.shp -o PG:dbname=autotest >/dev/null; then
56+
echo "Failure expected"
57+
exit 1
58+
fi
59+
if test -d PG:dbname=autotest; then
60+
echo "Directory PG:dbname=autotest should not have been created"
61+
exit 1
62+
fi
63+
mv gdalplugins/ogr_PG.so.disabled gdalplugins/ogr_PG.so

.github/workflows/alpine_32bit/Dockerfile.ci

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM i386/alpine:edge
1+
FROM i386/alpine:edge@sha256:42dc76bd326908c901e0a5b6ce58ec3a54126958f4c27f788798fac2b406f76a
22

33
RUN apk add \
44
apache-arrow-dev \
@@ -24,6 +24,7 @@ RUN apk add \
2424
kealib-dev \
2525
libaec-dev \
2626
libarchive-dev \
27+
libavif-dev \
2728
libdeflate-dev \
2829
libgeotiff-dev \
2930
libheif-dev \
@@ -44,7 +45,6 @@ RUN apk add \
4445
mariadb-connector-c-dev \
4546
netcdf-dev \
4647
odbc-cpp-wrapper-dev \
47-
ogdi-dev \
4848
openexr-dev \
4949
openjpeg-dev \
5050
openssl-dev \
@@ -57,6 +57,7 @@ RUN apk add \
5757
py3-pyarrow-pyc \
5858
py3-numpy \
5959
py3-numpy-dev \
60+
py3-numpy-tests \
6061
py3-pip \
6162
py3-setuptools \
6263
python3-dev \
@@ -73,4 +74,4 @@ RUN apk add \
7374
zstd-dev
7475

7576
COPY requirements.txt /tmp/
76-
RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
77+
RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install --break-system-packages -U -r /tmp/requirements.txt

.github/workflows/alpine_32bit/test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ make quicktest
1111
PYTEST_SKIP=
1212
PYTEST_XFAIL="gcore/tiff_ovr.py gdrivers/gribmultidim.py gdrivers/mbtiles.py gdrivers/vrtwarp.py gdrivers/wcs.py utilities/test_gdalwarp.py pyscripts/test_gdal_pansharpen.py"
1313

14-
# Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf"
15-
PYTEST_SKIP="ogr/ogr_ogdi.py $PYTEST_SKIP"
16-
1714
# Stalls on it. Probably not enough memory
1815
PYTEST_SKIP="gdrivers/jp2openjpeg.py $PYTEST_SKIP"
1916

.github/workflows/alpine_numpy2/Dockerfile.ci

Lines changed: 0 additions & 82 deletions
This file was deleted.

.github/workflows/alpine_numpy2/build.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/android_cmake.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ on:
44
push:
55
paths-ignore:
66
- 'doc/**'
7+
- 'docker/**'
78
branches-ignore:
89
- 'backport**'
910
- 'dependabot**'
1011
pull_request:
1112
paths-ignore:
1213
- 'doc/**'
14+
- 'docker/**'
1315

1416
concurrency:
1517
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -24,10 +26,10 @@ jobs:
2426
runs-on: ubuntu-latest
2527
steps:
2628
- name: Checkout
27-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2830

2931
- name: Cache
30-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
32+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3133
id: cache
3234
with:
3335
path: |

0 commit comments

Comments
 (0)