Skip to content

Fix trial PGPRO version parse #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
demonolock merged 2 commits into from
Jun 29, 2026
Merged

Fix trial PGPRO version parse #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a19e16
Fix trial PGPRO version parse
Jun 29, 2026
ba89261
export func and bump version
Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
bound_ports, \
get_bin_path, \
get_pg_config, \
get_pg_version
get_pg_version, \
parse_pg_version

from .standby import \
First, \
Expand All @@ -56,7 +57,7 @@
from testgres.operations.local_ops import LocalOperations
from testgres.operations.remote_ops import RemoteOperations

__version__ = "1.14.3"
__version__ = "1.14.4"

__all__ = [
"get_new_node",
Expand All @@ -71,7 +72,7 @@
"NodeApp",
"PostgresNode",
"PortManager",
"reserve_port", "release_port", "bound_ports", "get_bin_path", "get_pg_config", "get_pg_version",
"reserve_port", "release_port", "bound_ports", "get_bin_path", "get_pg_config", "get_pg_version", "parse_pg_version",
"First", "Any",
"OsOperations", "LocalOperations", "RemoteOperations", "ConnectionParams"
]
3 changes: 2 additions & 1 deletion src/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ def parse_pg_version(version_out):
version = raw_ver.split(' ')[-1] \
.partition('devel')[0] \
.partition('beta')[0] \
.partition('rc')[0]
.partition('rc')[0] \
.partition('-')[0]
return version


Expand Down
2 changes: 1 addition & 1 deletion tests/test_testgres_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def test_testgres_version(self):
# Author: Mark G.
assert v.major == 1
assert v.minor == 14
assert v.micro == 3
assert v.micro == 4

assert str(v) == testgres_version
return
Expand Down
3 changes: 3 additions & 0 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ def test_parse_pg_version(self):
assert parse_pg_version("postgres (PostgreSQL) 11.4") == "11.4"
# Macos
assert parse_pg_version("postgres (PostgreSQL) 14.9 (Homebrew)") == "14.9"
# Postgres Pro trial
assert parse_pg_version("postgres (PostgreSQL) 18.4-TRIAL") == "18.4"
assert parse_pg_version("PostgreSQL 18.4-TRIAL") == "18.4"

def test_get_pg_config2(self, os_ops: OsOperations):
assert isinstance(os_ops, OsOperations)
Expand Down