Merge master

Author: v.shepard

.travis.yml

@@ -1,4 +1,6 @@
-sudo: required
+os: linux
+
+dist: bionic
 
 language: python
 
@@ -18,14 +20,15 @@ notifications:
         on_failure: always
 
 env:
-    - PYTHON_VERSION=2 PG_VERSION=10
-    - PYTHON_VERSION=2 PG_VERSION=9.6
-    - PYTHON_VERSION=2 PG_VERSION=9.5
-    - PYTHON_VERSION=2 PG_VERSION=9.4
+    - PYTHON_VERSION=3 PG_VERSION=14
     - PYTHON_VERSION=3 PG_VERSION=13
     - PYTHON_VERSION=3 PG_VERSION=12
     - PYTHON_VERSION=3 PG_VERSION=11
     - PYTHON_VERSION=3 PG_VERSION=10
-    - PYTHON_VERSION=3 PG_VERSION=9.6
-    - PYTHON_VERSION=3 PG_VERSION=9.5
-    - PYTHON_VERSION=3 PG_VERSION=9.4
+#    - PYTHON_VERSION=3 PG_VERSION=9.6
+#    - PYTHON_VERSION=3 PG_VERSION=9.5
+#    - PYTHON_VERSION=3 PG_VERSION=9.4
+#    - PYTHON_VERSION=2 PG_VERSION=10
+#    - PYTHON_VERSION=2 PG_VERSION=9.6
+#    - PYTHON_VERSION=2 PG_VERSION=9.5
+#    - PYTHON_VERSION=2 PG_VERSION=9.4

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/postgrespro/testgres.svg?branch=master)](https://travis-ci.org/postgrespro/testgres)
+[![Build Status](https://travis-ci.com/postgrespro/testgres.svg?branch=master)](https://app.travis-ci.com/github/postgrespro/testgres/branches)
 [![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)
 [![PyPI version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)
 

docs/README.md

@@ -1,9 +1,9 @@
 # Building the documentation
 
-Make sure you have `Sphinx` and `sphinxcontrib-napoleon` packages installed:
+Make sure you have `Sphinx` package installed:
 
 ```
-pip install Sphinx sphinxcontrib-napoleon
+pip install Sphinx
 ```
 
 Then just run
@@ -12,4 +12,4 @@ Then just run
 make html
 ```
 
-Documentation will be built in `build/html` directory. Other output formats are also available; run `make` without arguments to see the options.
+Documentation will be built in `build/html` directory. Other output formats are also available; run `make` without arguments to see the options.

docs/source/conf.py

@@ -19,7 +19,7 @@
 # -- Project information -----------------------------------------------------
 
 project = u'testgres'
-copyright = u'2016-2018, Postgres Professional'
+copyright = u'2016-2022, Postgres Professional'
 author = u'Postgres Professional'
 
 # The short X.Y version
@@ -36,7 +36,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'sphinxcontrib.napoleon']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.napoleon']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

run_tests.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2017, Postgres Professional
+# Copyright (c) 2017-2022 Postgres Professional
 
 set -eux
 
@@ -22,7 +22,7 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1
 source $VENV_PATH/bin/activate
 
 # install utilities
-$PIP install coverage flake8 psutil Sphinx sphinxcontrib-napoleon
+$PIP install coverage flake8 psutil Sphinx
 
 # install testgres' dependencies
 export PYTHONPATH=$(pwd)

testgres/__init__.py

@@ -15,8 +15,23 @@
     ProgrammingError, \
     OperationalError
 
-from .exceptions import *
-from .enums import *
+from .exceptions import \
+    TestgresException, \
+    ExecUtilException, \
+    QueryException, \
+    TimeoutException, \
+    CatchUpException, \
+    StartNodeException, \
+    InitNodeException, \
+    BackupException
+
+from .enums import \
+    XLogMethod, \
+    IsolationLevel, \
+    NodeStatus, \
+    ProcessType, \
+    DumpFormat
+
 from .node import PostgresNode
 
 from .utils import \
@@ -30,3 +45,15 @@
 from .standby import \
     First, \
     Any
+
+__all__ = [
+    "get_new_node",
+    "NodeBackup",
+    "TestgresConfig", "configure_testgres", "scoped_config", "push_config", "pop_config",
+    "NodeConnection", "DatabaseError", "InternalError", "ProgrammingError", "OperationalError",
+    "TestgresException", "ExecUtilException", "QueryException", "TimeoutException", "CatchUpException", "StartNodeException", "InitNodeException", "BackupException",
+    "XLogMethod", "IsolationLevel", "NodeStatus", "ProcessType", "DumpFormat",
+    "PostgresNode",
+    "reserve_port", "release_port", "bound_ports", "get_bin_path", "get_pg_config", "get_pg_version",
+    "First", "Any",
+]

testgres/backup.py

@@ -29,7 +29,6 @@ class NodeBackup(object):
     """
     Smart object responsible for backups
     """
-
     @property
     def log_file(self):
         return os.path.join(self.base_dir, BACKUP_LOG_FILE)

testgres/cache.py

@@ -24,10 +24,8 @@
 def cached_initdb(data_dir, logfile=None, hostname='localhost', ssh_key=None, params=None):
     """
     Perform initdb or use cached node files.
-
-    DDD return
     """
-    
+
     def call_initdb(initdb_dir, log=None):
         try:
             _params = [get_bin_path("initdb"), "-D", initdb_dir, "-N"]

testgres/config.py

@@ -43,7 +43,6 @@ class GlobalConfig(object):
 
     _cached_initdb_dir = None
     """ underlying class attribute for cached_initdb_dir property """
-
     @property
     def cached_initdb_dir(self):
         """ path to a temp directory for cached initdb. """

testgres/connection.py

@@ -28,7 +28,6 @@ class NodeConnection(object):
     """
     Transaction wrapper returned by Node
     """
-
     def __init__(self,
                  node,
                  dbname=None,
@@ -42,12 +41,11 @@ def __init__(self,
 
         self._node = node
 
-        self._connection = pglib.connect(
-            database=dbname,
-            user=username,
-            password=password,
-            host=node.host,
-            port=node.port)
+        self._connection = pglib.connect(database=dbname,
+                                         user=username,
+                                         password=password,
+                                         host=node.host,
+                                         port=node.port)
 
         self._connection.autocommit = autocommit
         self._cursor = self.connection.cursor()

testgres/decorators.py

@@ -50,7 +50,6 @@ def method_decorator(decorator):
     """
     Convert a function decorator into a method decorator.
     """
-
     def _dec(func):
         def _wrapper(self, *args, **kwargs):
             @decorator

testgres/logger.py

@@ -24,7 +24,6 @@ class TestgresLogger(threading.Thread):
     """
     Helper class to implement reading from log files.
     """
-
     def __init__(self, node_name, log_file_name):
         threading.Thread.__init__(self)