Aug 16, 2025 · Aug 16, 2025 · Aug 16, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 14, 2025
diff --git a/Dockerfile--std-all.tmpl b/Dockerfile--std-all.tmpl
 # --------------------------------------------- final
 FROM base2_with_python-${PYTHON_VERSION} as final

 # it is required for getting external packages
 RUN apk add --no-cache git

 #RUN apk add --no-cache mc

 # Full version of "ps" command
diff --git a/Dockerfile--std.tmpl b/Dockerfile--std.tmpl
 # --------------------------------------------- final
 FROM base2_with_python-${PYTHON_VERSION} as final

 # it is required for getting external packages
 RUN apk add --no-cache git

 ENV LANG=C.UTF-8

 ADD . /pg/testgres
diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl
 # --------------------------------------------- final
 FROM base2_with_python-${PYTHON_VERSION} as final

 # it is required for getting external packages
 RUN apt install -y git

 ADD . /pg/testgres
 WORKDIR /pg/testgres
 RUN chown -R postgres /pg
diff --git a/docs/Makefile b/docs/Makefile
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 @pip install --force-reinstall ..
 @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/source/conf.py b/docs/source/conf.py
 #
 import os
 import sys
 sys.path.insert(0, os.path.abspath('../..'))
 import testgres

 assert testgres.__path__ is not None
 assert len(testgres.__path__) == 1
 assert type(testgres.__path__[0] == str)  # noqa: E721
 p = os.path.dirname(testgres.__path__[0])
 assert type(p) == str  # noqa: E721
 sys.path.insert(0, os.path.abspath(p))

 # -- Project information -----------------------------------------------------

 project = u'testgres'
 package_name = u'testgres'
 copyright = u'2016-2023, Postgres Professional'
 author = u'Postgres Professional'

 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
 language =None
 language ="en"

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
diff --git a/setup.py b/setup.py
 if sys.version_info < (3, 3):
    install_requires.append("ipaddress")

 install_requires.append(
    "testgres.os_ops @ git+https://github.com/postgrespro/testgres.os_ops.git"
 )

 # Get contents of README file
 with open('README.md', 'r') as f:
    readme = f.read()

 setup(
    version='1.11.1',
    name='testgres',
    packages=['testgres', 'testgres.operations', 'testgres.impl'],
    packages=['testgres', 'testgres.impl'],
    package_dir={"testgres": "src"},
    description='Testing utility for PostgreSQL and its extensions',
    url='https://github.com/postgrespro/testgres',
    long_description=readme,
diff --git a/testgres/__init__.py → src/__init__.py b/testgres/__init__.py → src/__init__.py

 from .config import testgres_config

 from .operations.os_ops import OsOperations, ConnectionParams
 from .operations.local_ops import LocalOperations
 from .operations.remote_ops import RemoteOperations
 fromtestgres.operations.os_ops import OsOperations, ConnectionParams
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.remote_ops import RemoteOperations

 __all__ = [
    "get_new_node",
diff --git a/testgres/api.py → src/api.py b/testgres/api.py → src/api.py
diff --git a/testgres/backup.py → src/backup.py b/testgres/backup.py → src/backup.py

 from .exceptions import BackupException

 from .operations.os_ops import OsOperations
 fromtestgres.operations.os_ops import OsOperations

 from .utils import \
    get_bin_path2, \
diff --git a/testgres/cache.py → src/cache.py b/testgres/cache.py → src/cache.py
    get_bin_path2, \
    execute_utility2

 from .operations.local_ops import LocalOperations
 from .operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import OsOperations


 def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = None, bin_path=None, cached=True):
diff --git a/testgres/config.py → src/config.py b/testgres/config.py → src/config.py
 from contextlib import contextmanager

 from .consts import TMP_CACHE
 from .operations.os_ops import OsOperations
 from .operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations

 log_level = os.getenv('LOGGING_LEVEL', 'WARNING').upper()
 log_format = os.getenv('LOGGING_FORMAT', '%(asctime)s - %(levelname)s - %(message)s')
diff --git a/testgres/connection.py → src/connection.py b/testgres/connection.py → src/connection.py
diff --git a/testgres/consts.py → src/consts.py b/testgres/consts.py → src/consts.py
diff --git a/testgres/decorators.py → src/decorators.py b/testgres/decorators.py → src/decorators.py
diff --git a/testgres/defaults.py → src/defaults.py b/testgres/defaults.py → src/defaults.py
diff --git a/testgres/enums.py → src/enums.py b/testgres/enums.py → src/enums.py
diff --git a/src/exceptions.py b/src/exceptions.py
 # coding: utf-8

 import six

 from testgres.operations.exceptions import TestgresException
 from testgres.operations.exceptions import ExecUtilException
 from testgres.operations.exceptions import InvalidOperationException


 class PortForException(TestgresException):
    pass


 @six.python_2_unicode_compatible
 class QueryException(TestgresException):
    def __init__(self, message=None, query=None):
        super(QueryException, self).__init__(message)

        self.message = message
        self.query = query

    def __str__(self):
        msg = []

        if self.message:
            msg.append(self.message)

        if self.query:
            msg.append(u'Query: {}'.format(self.query))

        return six.text_type('\n').join(msg)


 class TimeoutException(QueryException):
    pass


 class CatchUpException(QueryException):
    pass


 @six.python_2_unicode_compatible
 class StartNodeException(TestgresException):
    def __init__(self, message=None, files=None):
        super(StartNodeException, self).__init__(message)

        self.message = message
        self.files = files

    def __str__(self):
        msg = []

        if self.message:
            msg.append(self.message)

        for f, lines in self.files or []:
            msg.append(u'{}\n----\n{}\n'.format(f, lines))

        return six.text_type('\n').join(msg)


 class InitNodeException(TestgresException):
    pass


 class BackupException(TestgresException):
    pass


 assert ExecUtilException.__name__ == "ExecUtilException"
 assert InvalidOperationException.__name__ == "InvalidOperationException"
diff --git a/testgres/impl/port_manager__generic.py → src/impl/port_manager__generic.py b/testgres/impl/port_manager__generic.py → src/impl/port_manager__generic.py
 from..operations.os_ops import OsOperations
 fromtestgres.operations.os_ops import OsOperations

 from ..port_manager import PortManager
 from ..exceptions import PortForException
diff --git a/testgres/impl/port_manager__this_host.py → src/impl/port_manager__this_host.py b/testgres/impl/port_manager__this_host.py → src/impl/port_manager__this_host.py
diff --git a/testgres/logger.py → src/logger.py b/testgres/logger.py → src/logger.py
diff --git a/testgres/node.py → src/node.py b/testgres/node.py → src/node.py

 from .backup import NodeBackup

 from .operations.os_ops import ConnectionParams
 from .operations.os_ops import OsOperations
 from .operations.local_ops import LocalOperations
 fromtestgres.operations.os_ops import ConnectionParams
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.local_ops import LocalOperations

 InternalError = pglib.InternalError
 ProgrammingError = pglib.ProgrammingError
diff --git a/testgres/node_app.py → src/node_app.py b/testgres/node_app.py → src/node_app.py
diff --git a/testgres/port_manager.py → src/port_manager.py b/testgres/port_manager.py → src/port_manager.py
diff --git a/testgres/pubsub.py → src/pubsub.py b/testgres/pubsub.py → src/pubsub.py
diff --git a/testgres/standby.py → src/standby.py b/testgres/standby.py → src/standby.py
diff --git a/testgres/utils.py → src/utils.py b/testgres/utils.py → src/utils.py

 from .exceptions import ExecUtilException
 from .config import testgres_config as tconf
 from .operations.os_ops import OsOperations
 from .operations.remote_ops import RemoteOperations
 from .operations.local_ops import LocalOperations
 from .operations.helpers import Helpers as OsHelpers
 fromtestgres.operations.os_ops import OsOperations
 fromtestgres.operations.remote_ops import RemoteOperations
 fromtestgres.operations.local_ops import LocalOperations
 fromtestgres.operations.helpers import Helpers as OsHelpers

 from .impl.port_manager__generic import PortManager__Generic

diff --git a/testgres/operations/__init__.py b/testgres/operations/__init__.py
diff --git a/testgres/operations/helpers.py b/testgres/operations/helpers.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,9 @@ ENV PYTHON_VERSION=3
		# --------------------------------------------- final
		FROM base2_with_python-${PYTHON_VERSION} as final

		# it is required for getting external packages
		RUN apk add --no-cache git

		#RUN apk add --no-cache mc

		# Full version of "ps" command
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,6 +47,9 @@ ENV PYTHON_VERSION=3
		# --------------------------------------------- final
		FROM base2_with_python-${PYTHON_VERSION} as final

		# it is required for getting external packages
		RUN apt install -y git

		ADD . /pg/testgres
		WORKDIR /pg/testgres
		RUN chown -R postgres /pg
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,5 @@ help:
		# Catch-all target: route all unknown targets to Sphinx using the new
		# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
		%: Makefile
		@pip install --force-reinstall ..
		@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,11 +14,19 @@
		#
		import os
		import sys
		sys.path.insert(0, os.path.abspath('../..'))
		import testgres

		assert testgres.__path__ is not None
		assert len(testgres.__path__) == 1
		assert type(testgres.__path__[0] == str) # noqa: E721
		p = os.path.dirname(testgres.__path__[0])
		assert type(p) == str # noqa: E721
		sys.path.insert(0, os.path.abspath(p))

		# -- Project information -----------------------------------------------------

		project = u'testgres'
		package_name = u'testgres'
		copyright = u'2016-2023, Postgres Professional'
		author = u'Postgres Professional'

Expand DownExpand Up		@@ -55,7 +63,7 @@
		#
		# This is also used if you do content translation via gettext catalogs.
		# Usually you set "language" from the command line for these cases.
		language =None
		language ="en"

		# List of patterns, relative to source directory, that match files and
		# directories to ignore when looking for source files.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,14 +22,19 @@
		if sys.version_info < (3, 3):
		install_requires.append("ipaddress")

		install_requires.append(
		"testgres.os_ops @ git+https://github.com/postgrespro/testgres.os_ops.git"
		)

		# Get contents of README file
		with open('README.md', 'r') as f:
		readme = f.read()

		setup(
		version='1.11.1',
		name='testgres',
		packages=['testgres', 'testgres.operations', 'testgres.impl'],
		packages=['testgres', 'testgres.impl'],
		package_dir={"testgres": "src"},
		description='Testing utility for PostgreSQL and its extensions',
		url='https://github.com/postgrespro/testgres',
		long_description=readme,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,9 +51,9 @@

		from .config import testgres_config

		from .operations.os_ops import OsOperations, ConnectionParams
		from .operations.local_ops import LocalOperations
		from .operations.remote_ops import RemoteOperations
		fromtestgres.operations.os_ops import OsOperations, ConnectionParams
		fromtestgres.operations.local_ops import LocalOperations
		fromtestgres.operations.remote_ops import RemoteOperations

		__all__ = [
		"get_new_node",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,7 @@

		from .exceptions import BackupException

		from .operations.os_ops import OsOperations
		fromtestgres.operations.os_ops import OsOperations

		from .utils import \
		get_bin_path2, \
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,8 +16,8 @@
		get_bin_path2, \
		execute_utility2

		from .operations.local_ops import LocalOperations
		from .operations.os_ops import OsOperations
		fromtestgres.operations.local_ops import LocalOperations
		fromtestgres.operations.os_ops import OsOperations


		def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = None, bin_path=None, cached=True):
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,8 +9,8 @@
		from contextlib import contextmanager

		from .consts import TMP_CACHE
		from .operations.os_ops import OsOperations
		from .operations.local_ops import LocalOperations
		fromtestgres.operations.os_ops import OsOperations
		fromtestgres.operations.local_ops import LocalOperations

		log_level = os.getenv('LOGGING_LEVEL', 'WARNING').upper()
		log_format = os.getenv('LOGGING_FORMAT', '%(asctime)s - %(levelname)s - %(message)s')
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,71 @@
		# coding: utf-8

		import six

		from testgres.operations.exceptions import TestgresException
		from testgres.operations.exceptions import ExecUtilException
		from testgres.operations.exceptions import InvalidOperationException


		class PortForException(TestgresException):
		pass


		@six.python_2_unicode_compatible
		class QueryException(TestgresException):
		def __init__(self, message=None, query=None):
		super(QueryException, self).__init__(message)

		self.message = message
		self.query = query

		def __str__(self):
		msg = []

		if self.message:
		msg.append(self.message)

		if self.query:
		msg.append(u'Query: {}'.format(self.query))

		return six.text_type('\n').join(msg)


		class TimeoutException(QueryException):
		pass


		class CatchUpException(QueryException):
		pass


		@six.python_2_unicode_compatible
		class StartNodeException(TestgresException):
		def __init__(self, message=None, files=None):
		super(StartNodeException, self).__init__(message)

		self.message = message
		self.files = files

		def __str__(self):
		msg = []

		if self.message:
		msg.append(self.message)

		for f, lines in self.files or []:
		msg.append(u'{}\n----\n{}\n'.format(f, lines))

		return six.text_type('\n').join(msg)


		class InitNodeException(TestgresException):
		pass


		class BackupException(TestgresException):
		pass


		assert ExecUtilException.__name__ == "ExecUtilException"
		assert InvalidOperationException.__name__ == "InvalidOperationException"