Merge with master

asavchkov · asavchkov · commit 01e6a7bec0f9 · 2024-06-26T23:52:37.000+07:00
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     readme = f.read()
 
 setup(
-    version='1.10.0',
+    version='1.10.1',
     name='testgres',
     packages=['testgres', 'testgres.operations', 'testgres.helpers'],
     description='Testing utility for PostgreSQL and its extensions',
diff --git a/testgres/operations/os_ops.py b/testgres/operations/os_ops.py
@@ -11,8 +11,9 @@
 
 
 class ConnectionParams:
-    def __init__(self, host='127.0.0.1', ssh_key=None, username=None):
+    def __init__(self, host='127.0.0.1', port=None, ssh_key=None, username=None):
         self.host = host
+        self.port = port
         self.ssh_key = ssh_key
         self.username = username
 
diff --git a/testgres/operations/remote_ops.py b/testgres/operations/remote_ops.py
@@ -45,8 +45,8 @@ def __init__(self, conn_params: ConnectionParams):
         super().__init__(conn_params.username)
         self.conn_params = conn_params
         self.host = conn_params.host
-        self.ssh_key = conn_params.ssh_key
         self.port = conn_params.port
+        self.ssh_key = conn_params.ssh_key
         self.ssh_args = []
         if self.ssh_key:
             self.ssh_args += ["-i", self.ssh_key]
@@ -286,7 +286,7 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal
             mode = "r+b" if binary else "r+"
 
         with tempfile.NamedTemporaryFile(mode=mode, delete=False) as tmp_file:
-            # Because in scp we set up port using -P option
+            # For scp the port is specified by a "-P" option
             scp_args = ['-P' if x == '-p' else x for x in self.ssh_args]
 
             if not truncate:
diff --git a/testgres/plugins/pg_probackup2/setup.py b/testgres/plugins/pg_probackup2/setup.py
@@ -4,7 +4,7 @@
     from distutils.core import setup
 
 setup(
-    version='0.0.2',
+    version='0.0.3',
     name='testgres_pg_probackup2',
     packages=['pg_probackup2', 'pg_probackup2.storage'],
     description='Plugin for testgres that manages pg_probackup2',
