[SCM] PostGIS branch master updated. 3.7.0alpha1-661-gb52a08bfb
git at osgeo.org
git at osgeo.org
Mon Jul 20 01:32:25 PDT 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 b52a08bfb7af19711e74bf987306af94cc4ad707 (commit)
via 96606a931be3b08413bfead0cc462b96cf08f042 (commit)
from 19be897cda155cde7cabe555d73a27cdc50ea6f0 (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 b52a08bfb7af19711e74bf987306af94cc4ad707
Merge: 19be897cd 96606a931
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Mon Jul 20 01:32:23 2026 -0700
Merge pull request 'Fix upgrade harness tests after version bump' (#467)
Fix upgrade harness tests after version bump
commit 96606a931be3b08413bfead0cc462b96cf08f042
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Mon Jul 20 11:07:14 2026 +0400
Fix upgrade harness tests after version bump
diff --git a/utils/test_check_all_upgrades.py b/utils/test_check_all_upgrades.py
index 3b8633d56..833098eac 100644
--- a/utils/test_check_all_upgrades.py
+++ b/utils/test_check_all_upgrades.py
@@ -12,6 +12,7 @@ import unittest
class FakePostgresTools:
def __init__(self, repo_root):
self.repo_root = repo_root
+ self.current_version = self._read_current_version()
self.temp_dir = tempfile.TemporaryDirectory()
self.root = Path(self.temp_dir.name)
self.sharedir = self.root / "pg_sharedir"
@@ -123,6 +124,19 @@ sys.exit(0)
script.write_text(body + "\n", encoding="utf-8")
script.chmod(0o755)
+ def _read_current_version(self):
+ parts = []
+ version_keys = (
+ "POSTGIS_MAJOR_VERSION",
+ "POSTGIS_MINOR_VERSION",
+ "POSTGIS_MICRO_VERSION",
+ )
+ for line in (self.repo_root / "Version.config").read_text(encoding="utf-8").splitlines():
+ key, _, value = line.partition("=")
+ if key in version_keys:
+ parts.append(value.strip())
+ return ".".join(parts)
+
def create_extension_files(self, extension, versions):
for version in versions:
(self.extension_dir / f"{extension}--{version}.sql").write_text("--", encoding="utf-8")
@@ -142,7 +156,7 @@ sys.exit(0)
env["PATH"] = f"{self.bin_dir}:{env['PATH']}"
env["CHECK_ALL_UPGRADES_SHAREDIR"] = str(self.sharedir)
env["CHECK_ALL_UPGRADES_PG_VERSION"] = "PostgreSQL 16.2 (Debian)"
- env["CHECK_ALL_UPGRADES_AUTO_VERSION"] = "3.7.0dev"
+ env["CHECK_ALL_UPGRADES_AUTO_VERSION"] = self.current_version
env["CHECK_ALL_UPGRADES_PSQL_PATH_MAP"] = json.dumps(self.path_map)
env["CHECK_ALL_UPGRADES_GMAKE_FAIL"] = json.dumps(self.fail_patterns)
env["CHECK_ALL_UPGRADES_PSQL_LOG"] = str(self.psql_log)
@@ -185,25 +199,26 @@ class CheckAllUpgradesHarnessTest(unittest.TestCase):
self.harness.close()
def test_default_exhaustive_runs_packaged_and_unpacked_paths(self):
- self.harness.create_extension_files("postgis", ["3.5.0", "3.6.0", "3.7.0dev"])
- self.harness.create_extension_files("postgis_topology", ["3.7.0dev"])
+ current_version = self.harness.current_version
+ self.harness.create_extension_files("postgis", ["3.5.0", "3.6.0", current_version])
+ self.harness.create_extension_files("postgis_topology", [current_version])
self.harness.create_contrib_files(["3.6.0"])
self.harness.set_path_map(
{
- "postgis|3.5.0|3.7.0dev": "up",
- "postgis|3.6.0|3.7.0dev": "up",
- "postgis|unpackaged|3.7.0dev": "up",
- "postgis_topology|3.7.0dev|3.7.0dev": "up",
- "postgis_topology|unpackaged|3.7.0dev": "up",
+ f"postgis|3.5.0|{current_version}": "up",
+ f"postgis|3.6.0|{current_version}": "up",
+ f"postgis|unpackaged|{current_version}": "up",
+ f"postgis_topology|{current_version}|{current_version}": "up",
+ f"postgis_topology|unpackaged|{current_version}": "up",
}
)
- result = self.harness.run("3.7.0dev")
+ result = self.harness.run(current_version)
output = result.stdout + result.stderr
self.assertEqual(0, result.returncode)
- self.assertIn("Testing postgis extension upgrade 3.5.0--3.7.0dev", output)
- self.assertIn("Testing postgis extension upgrade 3.6.0--3.7.0dev", output)
+ self.assertIn(f"Testing postgis extension upgrade 3.5.0--{current_version}", output)
+ self.assertIn(f"Testing postgis extension upgrade 3.6.0--{current_version}", output)
self.assertIn("Testing postgis script soft upgrade", output)
self.assertIn("Testing postgis script hard upgrade", output)
@@ -295,16 +310,17 @@ class CheckAllUpgradesHarnessTest(unittest.TestCase):
self.assertIn("topology/test", cmd)
def test_unpackaged_soft_and_hard_share_oldest_upgrade_source(self):
- self.harness.create_extension_files("postgis", ["3.6.0", "3.7.0dev"])
+ current_version = self.harness.current_version
+ self.harness.create_extension_files("postgis", ["3.6.0", current_version])
self.harness.create_contrib_files(["3.5.0", "3.6.0"])
self.harness.set_path_map(
{
- "postgis|3.6.0|3.7.0dev": "up",
- "postgis|unpackaged|3.7.0dev": "up",
+ f"postgis|3.6.0|{current_version}": "up",
+ f"postgis|unpackaged|{current_version}": "up",
}
)
- result = self.harness.run("3.7.0dev", args=("--oldest",))
+ result = self.harness.run(current_version, args=("--oldest",))
output = result.stdout + result.stderr
calls = self.harness.make_calls()
-----------------------------------------------------------------------
Summary of changes:
utils/test_check_all_upgrades.py | 46 +++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 15 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list