[SCM] PostGIS branch master updated. 3.6.0rc2-369-gbe42c3370
git at osgeo.org
git at osgeo.org
Fri Mar 6 09:45:58 PST 2026
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via be42c33700f1f4bd34ae8ee181509cf1e89de680 (commit)
via 51fc9568c2fe7507600a97393dedba1d43f2d102 (commit)
via ee2614b25095b2c256a8f167601e68605587f93d (commit)
from 67d1d0640e2e01d1fff997372bf357250fecc90d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit be42c33700f1f4bd34ae8ee181509cf1e89de680
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Mar 6 21:28:47 2026 +0400
ci: run codespell directly with repo config
diff --git a/.codespellrc b/.codespellrc
index 964a27237..b68fd7fbf 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,4 +1,50 @@
[codespell]
-# utils/check_spelling.sh builds a deterministic list of tracked files plus
-# generated comment SQL.
ignore-words = .codespell.ignore
+skip =
+ ./deps/**,
+ ./extensions/address_standardizer/**,
+ ./extensions/*/sql/**,
+ ./extensions/*/sql_bits/*.sql,
+ ./extensions/postgis_tiger_geocoder/sql_bits/*.sql.in,
+ ./doc/html/**,
+ ./doc/po/**,
+ ./doc/postgis-out.xml,
+ ./doc/postgis-nospecial.xml,
+ ./postgis/*.sql,
+ ./raster/rt_pg/*.sql,
+ aclocal.m4,
+ configure,
+ libtool,
+ ./macros/libtool.m4,
+ spatial_ref_sys.sql,
+ ./postgis/*for_extension.sql,
+ ./postgis/*for_extension.sql.in,
+ ./raster/rt_pg/*for_extension.sql,
+ ./raster/rt_pg/*for_extension.sql.in,
+ ./raster/rt_pg/*upgrade*.sql,
+ ./raster/rt_pg/*upgrade*.sql.in,
+ ./regress/*garden_result.txt,
+ ./autom4te.cache/**,
+ ./build-aux/**,
+ .deps/**,
+ .libs/**,
+ **/.deps/**,
+ **/.libs/**,
+ ./regress/00-regress-install/**,
+ *.po,
+ *.o,
+ *.lo,
+ *.la,
+ *.a,
+ *.so,
+ *.so.*,
+ *.dll,
+ *.dylib,
+ *.pyc,
+ *.tmp,
+ *.generated,
+ *.needlessly-hardcoded,
+ *.gcda,
+ *.gcno,
+ *.gcov,
+ *~
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 617153b0b..a575d9bdd 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -22,11 +22,17 @@ jobs:
- name: 'Install codespell'
run: |
sudo apt-get update
- sudo apt-get install -y --no-install-recommends libxml2-utils docbook-xml docbook-xsl docbook-xsl-ns xsltproc
+ sudo apt-get install -y --no-install-recommends \
+ autoconf automake libtool pkg-config \
+ postgresql-server-dev-all \
+ libgeos-dev libproj-dev libxml2-dev \
+ libxml2-utils docbook-xml docbook-xsl docbook-xsl-ns xsltproc
sudo pip install codespell
- name: 'Build & Test'
run: |
codespell --version
+ ./autogen.sh
+ ./configure --without-raster --without-topology --without-sfcgal --without-json --without-protobuf
make -C doc comments
- ./utils/check_spelling.sh
+ codespell --config .codespellrc .
diff --git a/GNUmakefile.in b/GNUmakefile.in
index e468eed66..2318fc9a7 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -307,7 +307,7 @@ endif
check-spell:
ifneq (@CODESPELL@,)
- cd $(top_srcdir) && ./utils/check_spelling.sh @CODESPELL@
+ cd $(top_srcdir) && @CODESPELL@ --config .codespellrc .
else
@echo "SKIP: spell checking disabled"
endif
diff --git a/utils/check_spelling.sh b/utils/check_spelling.sh
deleted file mode 100755
index 5537675ed..000000000
--- a/utils/check_spelling.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CODESPELL=${1:-codespell}
-
-ROOT=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
-cd "$ROOT"
-
-tmpfiles=$(mktemp)
-trap 'rm -f "$tmpfiles"' EXIT HUP INT TERM
-
-# Keep the check deterministic by starting from tracked files and excluding
-# vendor data, generated trees, and authoritative datasets that are not prose.
-git ls-files -z -- . \
- ':(exclude)deps' \
- ':(exclude)extensions/address_standardizer' \
- ':(exclude)doc/html' \
- ':(exclude)doc/po' \
- ':(exclude)doc/postgis-out.xml' \
- ':(exclude)doc/postgis-nospecial.xml' \
- ':(exclude)aclocal.m4' \
- ':(exclude)configure' \
- ':(exclude)macros/libtool.m4' \
- ':(exclude)spatial_ref_sys.sql' \
- ':(exclude)extensions/postgis/sql/spatial_ref_sys.sql' \
- ':(glob,exclude)extensions/postgis/sql/postgis--*.sql' \
- ':(glob,exclude)**/*.po' \
- > "$tmpfiles"
-
-# The comment SQL files are generated from the docs and shipped in release
-# artifacts, so include them when they exist.
-for generated in doc/postgis_comments.sql \
- doc/raster_comments.sql \
- doc/sfcgal_comments.sql \
- doc/tiger_geocoder_comments.sql \
- doc/topology_comments.sql
-do
- if [ -f "$generated" ]; then
- printf '%s\0' "$generated" >> "$tmpfiles"
- fi
-done
-
-xargs -0 "$CODESPELL" --config .codespellrc < "$tmpfiles"
commit 51fc9568c2fe7507600a97393dedba1d43f2d102
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Mar 6 20:58:20 2026 +0400
sfcgal/tests: restore 2-component alpha shape expectations
diff --git a/sfcgal/regress/alphashape_components.sql b/sfcgal/regress/alphashape_components.sql
index 3dcfa350c..38e896ffd 100644
--- a/sfcgal/regress/alphashape_components.sql
+++ b/sfcgal/regress/alphashape_components.sql
@@ -1,6 +1,4 @@
--- Normalize POLYGON vs MULTIPOLYGON output so this SFCGAL 2.3+ regression
--- checks the stable shape result rather than a raw return-type difference.
SELECT 'CG_Optimalalphashape_2components',
- ST_AsText(ST_Normalize(ST_Multi(CG_OptimalAlphaShape('MULTIPOINT((10.1 0.2),(8.1 0.1),(6.0 0.0),(4.2 0.3),(2.5 1.0),(1.2 2.3),(0.4 4.0),(0.1 6.1),(0.3 8.2),(1.1 10.1),(2.6 11.2),(4.1 11.9),(6.2 12.1),(8.3 11.8),(10.2 11.1),(9.1 9.9),(7.6 9.8),(6.1 9.9),(4.8 9.2),(3.8 8.0),(3.6 6.2),(3.7 4.1),(4.6 2.9),(6.0 2.3),(7.8 2.2),(9.2 2.4),(40.3 0.4),(40.1 3.1),(39.8 6.2),(40.4 9.0),(40.2 12.3),(40.5 15.2),(41.9 15.6),(43.1 15.3),(54.3 15.2),(55.8 15.0),(55.6 12.1),(55.9 9.2),(55.5 6.0),(55.7 3.3),(55.4 0.5),(52.6 0.1),(49.8 -0.2),(46.9 2.8),(44.2 0.2),(42.1 0.3),(43.0 3.8),(43.3 7.1),(43.1 10.4),(52.9 10.6),(52.7 7.3),(52.8 4.1))', allow_holes => false, nb_components => 2))));
+ ST_AsText(CG_OptimalAlphaShape('MULTIPOINT((10.1 0.2),(8.1 0.1),(6.0 0.0),(4.2 0.3),(2.5 1.0),(1.2 2.3),(0.4 4.0),(0.1 6.1),(0.3 8.2),(1.1 10.1),(2.6 11.2),(4.1 11.9),(6.2 12.1),(8.3 11.8),(10.2 11.1),(9.1 9.9),(7.6 9.8),(6.1 9.9),(4.8 9.2),(3.8 8.0),(3.6 6.2),(3.7 4.1),(4.6 2.9),(6.0 2.3),(7.8 2.2),(9.2 2.4),(40.3 0.4),(40.1 3.1),(39.8 6.2),(40.4 9.0),(40.2 12.3),(40.5 15.2),(41.9 15.6),(43.1 15.3),(54.3 15.2),(55.8 15.0),(55.6 12.1),(55.9 9.2),(55.5 6.0),(55.7 3.3),(55.4 0.5),(52.6 0.1),(49.8 -0.2),(46.9 2.8),(44.2 0.2),(42.1 0.3),(43.0 3.8),(43.3 7.1),(43.1 10.4),(52.9 10.6),(52.7 7.3),(52.8 4.1))', allow_holes => false, nb_components => 2));
SELECT 'CG_OptimalAlphaShape_hole_2components',
- ST_AsText(ST_Normalize(ST_Multi(CG_OptimalAlphaShape('MULTIPOINT((0 0),(0 1),(0 2),(0 3),(0 4),(0 5),(0 6),(0 7),(0 8),(0 9),(1 10),(2 10),(3 10),(4 10),(4.5 9.5),(5 9),(5.5 8.5),(6 8),(6 7),(6 6),(5.5 5.5),(5 5),(4 5),(3 5),(2 5),(1 5),(1 4),(2 4),(3 4),(4 4),(4.5 3.5),(5 3),(6 2),(6 1),(5.5 0.5),(5 0),(4 0),(3 0),(2 0),(1 0),(0.5 0),(0.5 1),(0.5 2),(0.5 3),(0.5 4),(0.5 5),(0.5 6),(0.5 7),(0.5 8),(0.5 9),(0.5 10),(1 9.5),(2 9.5),(3 9.5),(4 9.5),(4.5 9),(5 8.5),(5.5 8),(5.5 7),(5.5 6),(5.5 6.5),(5 5.5),(4 5.5),(3 5.5),(2 5.5),(1 5.5),(1.5 4.5),(2.5 4.5),(3.5 4.5),(4 4.5),(4.5 4),(5 3.5),(5.5 3),(5.5 2),(5.5 1),(5 0.5),(4 0.5),(3 0.5),(2 0.5),(1 0.5),(12 0),(12 1),(12 2),(12 3),(12 4),(12 5),(12 6),(12 7),(12 8),(12 9),(12 10),(13 10),(14 10),(15 10),(16 10),(16.5 9.5),(17 9),(17.5 8.5),(18 8),(18 7),(18 6),(17.5 5.5),(17 5),(16 5),(15 5),(14 5),(13 5),(12.5 0),(12.5 1),(12.5 2),(12.5 3),(12.5 4),(12.5 5),(12.5 6),(12.5 7),(12.5 8),(12.5 9),(12.5 10),(13 9.5),(14 9.5),(15 9.5)
,(16 9.5),(16.5 9),(17 8.5),(17.5 8),(17.5 7),(17.5 6),(17.5 6.5),(17 5.5),(16 5.5),(15 5.5),(14 5.5),(13 5.5),(13 1),(13 2),(13 3),(13 4),(17.5 7.4),(18 7.3),(5.1 2.5),(5.8 2.5),(0.03 9.82),(0.23 10))', allow_holes => true, nb_components => 2))));
+ ST_AsText(CG_OptimalAlphaShape('MULTIPOINT((0 0),(0 1),(0 2),(0 3),(0 4),(0 5),(0 6),(0 7),(0 8),(0 9),(1 10),(2 10),(3 10),(4 10),(4.5 9.5),(5 9),(5.5 8.5),(6 8),(6 7),(6 6),(5.5 5.5),(5 5),(4 5),(3 5),(2 5),(1 5),(1 4),(2 4),(3 4),(4 4),(4.5 3.5),(5 3),(6 2),(6 1),(5.5 0.5),(5 0),(4 0),(3 0),(2 0),(1 0),(0.5 0),(0.5 1),(0.5 2),(0.5 3),(0.5 4),(0.5 5),(0.5 6),(0.5 7),(0.5 8),(0.5 9),(0.5 10),(1 9.5),(2 9.5),(3 9.5),(4 9.5),(4.5 9),(5 8.5),(5.5 8),(5.5 7),(5.5 6),(5.5 6.5),(5 5.5),(4 5.5),(3 5.5),(2 5.5),(1 5.5),(1.5 4.5),(2.5 4.5),(3.5 4.5),(4 4.5),(4.5 4),(5 3.5),(5.5 3),(5.5 2),(5.5 1),(5 0.5),(4 0.5),(3 0.5),(2 0.5),(1 0.5),(12 0),(12 1),(12 2),(12 3),(12 4),(12 5),(12 6),(12 7),(12 8),(12 9),(12 10),(13 10),(14 10),(15 10),(16 10),(16.5 9.5),(17 9),(17.5 8.5),(18 8),(18 7),(18 6),(17.5 5.5),(17 5),(16 5),(15 5),(14 5),(13 5),(12.5 0),(12.5 1),(12.5 2),(12.5 3),(12.5 4),(12.5 5),(12.5 6),(12.5 7),(12.5 8),(12.5 9),(12.5 10),(13 9.5),(14 9.5),(15 9.5),(16 9.5),(16.5 9),(17
8.5),(17.5 8),(17.5 7),(17.5 6),(17.5 6.5),(17 5.5),(16 5.5),(15 5.5),(14 5.5),(13 5.5),(13 1),(13 2),(13 3),(13 4),(17.5 7.4),(18 7.3),(5.1 2.5),(5.8 2.5),(0.03 9.82),(0.23 10))', allow_holes => true, nb_components => 2));
diff --git a/sfcgal/regress/alphashape_components_expected b/sfcgal/regress/alphashape_components_expected
index 00efc058f..a30a4ad59 100644
--- a/sfcgal/regress/alphashape_components_expected
+++ b/sfcgal/regress/alphashape_components_expected
@@ -1,2 +1,2 @@
-CG_Optimalalphashape_2components|MULTIPOLYGON(((39.8 6.2,40.4 9,40.2 12.3,40.5 15.2,41.9 15.6,43.1 15.3,43.1 10.4,43.3 7.1,46.9 2.8,52.8 4.1,52.7 7.3,52.9 10.6,54.3 15.2,55.8 15,55.6 12.1,55.9 9.2,55.5 6,55.7 3.3,55.4 0.5,52.6 0.1,49.8 -0.2,44.2 0.2,42.1 0.3,40.3 0.4,40.1 3.1,39.8 6.2)),((0.1 6.1,0.3 8.2,1.1 10.1,2.6 11.2,4.1 11.9,6.2 12.1,8.3 11.8,10.2 11.1,9.1 9.9,7.6 9.8,3.6 6.2,6 2.3,7.8 2.2,9.2 2.4,10.1 0.2,8.1 0.1,6 0,4.2 0.3,2.5 1,1.2 2.3,0.4 4,0.1 6.1)))
-CG_OptimalAlphaShape_hole_2components|MULTIPOLYGON(((0 0,0 1,0 2,0 3,0 4,0 5,0 6,0 7,0 8,0 9,0.03 9.82,0.23 10,0.5 10,1 10,2 10,3 10,4 10,4.5 9.5,5 9,5.5 8.5,6 8,6 7,6 6,5.5 5.5,5 5,4 4.5,4.5 4,5 3.5,5.5 3,5.8 2.5,6 2,6 1,5.5 0.5,5 0,4 0,3 0,2 0,1 0,0.5 0,0 0),(0.5 6,1 5.5,2 5.5,3 5.5,4 5.5,5 5.5,5.5 6,5.5 6.5,5.5 7,5.5 8,5 8.5,4.5 9,4 9.5,3 9.5,2 9.5,1 9.5,0.5 9,0.5 8,0.5 7,0.5 6),(0.5 1,1 0.5,2 0.5,3 0.5,4 0.5,5 0.5,5.5 1,5.5 2,5.1 2.5,5 3,4.5 3.5,4 4,3 4,2 4,1 4,0.5 3,0.5 2,0.5 1)),((12 0,12 1,12 2,12 3,12 4,12 5,12 6,12 7,12 8,12 9,12 10,12.5 10,13 10,14 10,15 10,16 10,16.5 9.5,17 9,17.5 8.5,18 8,18 7.3,18 7,18 6,17.5 5.5,17 5,16 5,15 5,14 5,13 5,13 4,13 3,13 2,13 1,12.5 0,12 0),(12.5 6,13 5.5,14 5.5,15 5.5,16 5.5,17 5.5,17.5 6,17.5 6.5,17.5 7,17.5 7.4,17.5 8,17 8.5,16.5 9,16 9.5,15 9.5,14 9.5,13 9.5,12.5 9,12.5 8,12.5 7,12.5 6)))
+CG_Optimalalphashape_2components|MULTIPOLYGON(((8.3 11.8,6.2 12.1,4.1 11.9,2.6 11.2,1.1 10.1,0.3 8.2,0.1 6.1,0.4 4,1.2 2.3,2.5 1,4.2 0.3,6 0,8.1 0.1,10.1 0.2,9.2 2.4,7.8 2.2,6 2.3,3.6 6.2,7.6 9.8,9.1 9.9,10.2 11.1,8.3 11.8)),((55.6 12.1,55.8 15,54.3 15.2,52.9 10.6,52.7 7.3,52.8 4.1,46.9 2.8,43.3 7.1,43.1 10.4,43.1 15.3,41.9 15.6,40.5 15.2,40.2 12.3,40.4 9,39.8 6.2,40.1 3.1,40.3 0.4,42.1 0.3,44.2 0.2,49.8 -0.2,52.6 0.1,55.4 0.5,55.7 3.3,55.5 6,55.9 9.2,55.6 12.1)))
+CG_OptimalAlphaShape_hole_2components|MULTIPOLYGON(((5.5 8.5,5 9,4.5 9.5,4 10,3 10,2 10,1 10,0.5 10,0.23 10,0.03 9.82,0 9,0 8,0 7,0 6,0 5,0 4,0 3,0 2,0 1,0 0,0.5 0,1 0,2 0,3 0,4 0,5 0,5.5 0.5,6 1,6 2,5.8 2.5,5.5 3,5 3.5,4.5 4,4 4.5,5 5,5.5 5.5,6 6,6 7,6 8,5.5 8.5),(0.5 2,0.5 3,1 4,2 4,3 4,4 4,4.5 3.5,5 3,5.1 2.5,5.5 2,5.5 1,5 0.5,4 0.5,3 0.5,2 0.5,1 0.5,0.5 1,0.5 2),(0.5 7,0.5 8,0.5 9,1 9.5,2 9.5,3 9.5,4 9.5,4.5 9,5 8.5,5.5 8,5.5 7,5.5 6.5,5.5 6,5 5.5,4 5.5,3 5.5,2 5.5,1 5.5,0.5 6,0.5 7)),((17.5 8.5,17 9,16.5 9.5,16 10,15 10,14 10,13 10,12.5 10,12 10,12 9,12 8,12 7,12 6,12 5,12 4,12 3,12 2,12 1,12 0,12.5 0,13 1,13 2,13 3,13 4,13 5,14 5,15 5,16 5,17 5,17.5 5.5,18 6,18 7,18 7.3,18 8,17.5 8.5),(12.5 7,12.5 8,12.5 9,13 9.5,14 9.5,15 9.5,16 9.5,16.5 9,17 8.5,17.5 8,17.5 7.4,17.5 7,17.5 6.5,17.5 6,17 5.5,16 5.5,15 5.5,14 5.5,13 5.5,12.5 6,12.5 7)))
commit ee2614b25095b2c256a8f167601e68605587f93d
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Mar 6 20:41:35 2026 +0400
doc/uk: fix localized XML markup
diff --git a/doc/po/uk/postgis-manual.po b/doc/po/uk/postgis-manual.po
index 62e629932..9cb094ad0 100644
--- a/doc/po/uk/postgis-manual.po
+++ b/doc/po/uk/postgis-manual.po
@@ -4750,7 +4750,7 @@ msgid ""
"topogeometries created before the upgrade. This function fixes this "
"corruption in affected tables."
msgstr ""
-"При оновленні топології PostGIS <3.6.0 до версії >3.6.0+ було змінено "
+"При оновленні топології PostGIS <3.6.0 до версії >3.6.0+ було змінено "
"визначення стовпця topogeometry. Це спричинило пошкодження топогеометрій, "
"створених до оновлення. Ця функція виправляє це пошкодження в уражених "
"таблицях."
@@ -8653,7 +8653,7 @@ msgid ""
msgstr ""
"Для створення зображень, що використовуються в документації, необхідна "
"програма GraphicsMagick (<filename>gm convert</filename>). GraphicsMagick "
-"доступна за адресою <link xlink:href=«http://www.graphicsmagick.org/»> "
+"доступна за адресою <link xlink:href=\"http://www.graphicsmagick.org/\"> "
"http://www.graphicsmagick.org/ </link> ."
#. Tag: title
@@ -44475,8 +44475,8 @@ msgid ""
"postgresql.org/docs/current/rowtypes.html\">composite data type</link> "
"containing the fields:"
msgstr ""
-"<varname>geometry_dump</varname> — це <link xlink:href=«https://www."
-"postgresql.org/docs/current/rowtypes.html»>складний тип даних</link>, що "
+"<varname>geometry_dump</varname> — це <link xlink:href=\"https://www."
+"postgresql.org/docs/current/rowtypes.html\">складний тип даних</link>, що "
"містить такі поля:"
#. Tag: para
-----------------------------------------------------------------------
Summary of changes:
.codespellrc | 50 +++++++++++++++++++++++++--
.github/workflows/codespell.yml | 10 ++++--
GNUmakefile.in | 2 +-
doc/po/uk/postgis-manual.po | 8 ++---
sfcgal/regress/alphashape_components.sql | 6 ++--
sfcgal/regress/alphashape_components_expected | 4 +--
utils/check_spelling.sh | 44 -----------------------
7 files changed, 65 insertions(+), 59 deletions(-)
delete mode 100755 utils/check_spelling.sh
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list