⬆️ UPGRADE: psycopg2 allow v2.9

environment.yml

@@ -24,9 +24,9 @@ dependencies:
 - pamqp~=2.3
 - paramiko>=2.7.2,~=2.7
 - plumpy~=0.20.0
-- pgsu~=0.2.0
+- pgsu~=0.2.1
 - psutil~=5.6
-- psycopg2-binary~=2.8.3
+- psycopg2-binary~=2.8
 - python-dateutil~=2.8
 - pytz~=2021.1
 - pyyaml~=5.4

pyproject.toml

@@ -42,9 +42,9 @@ dependencies = [
         "pamqp~=2.3",
         "paramiko~=2.7,>=2.7.2",
         "plumpy~=0.20.0",
-        "pgsu~=0.2.0",
+        "pgsu~=0.2.1",
         "psutil~=5.6",
-        "psycopg2-binary~=2.8.3",
+        "psycopg2-binary~=2.8",
         "python-dateutil~=2.8",
         "pytz~=2021.1",
         "pyyaml~=5.4",

requirements/requirements-py-3.10.txt

@@ -94,7 +94,7 @@ plumpy==0.20.0
 prometheus-client==0.12.0
 prompt-toolkit==3.0.23
 psutil==5.8.0
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.1
 ptyprocess==0.7.0
 py==1.11.0
 py-cpuinfo==8.0.0

requirements/requirements-py-3.8.txt

@@ -95,7 +95,7 @@ plumpy==0.20.0
 prometheus-client==0.12.0
 prompt-toolkit==3.0.23
 psutil==5.8.0
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.1
 ptyprocess==0.7.0
 py==1.11.0
 py-cpuinfo==8.0.0

requirements/requirements-py-3.9.txt

@@ -94,7 +94,7 @@ plumpy==0.20.0
 prometheus-client==0.12.0
 prompt-toolkit==3.0.23
 psutil==5.8.0
-psycopg2-binary==2.8.6
+psycopg2-binary==2.9.1
 ptyprocess==0.7.0
 py==1.11.0
 py-cpuinfo==8.0.0

tests/backends/aiida_sqlalchemy/migrations/conftest.py

@@ -35,10 +35,15 @@ def uninitialised_profile(empty_pg_cluster: PGTest, tmp_path):  # pylint: disabl
 
     database_name = f'test_{uuid4().hex}'
 
-    with psycopg2.connect(**empty_pg_cluster.dsn) as conn:
+    conn = None
+    try:
+        conn = psycopg2.connect(**empty_pg_cluster.dsn)
         conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
         with conn.cursor() as cursor:
             cursor.execute(f"CREATE DATABASE {database_name} ENCODING 'utf8';")
+    finally:
+        if conn:
+            conn.close()
 
     yield Profile(
         'test_migrate', {
@@ -61,14 +66,19 @@ def uninitialised_profile(empty_pg_cluster: PGTest, tmp_path):  # pylint: disabl
         }
     )
 
-    with psycopg2.connect(**empty_pg_cluster.dsn) as conn:
+    conn = None
+    try:
+        conn = psycopg2.connect(**empty_pg_cluster.dsn)
         conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
         with conn.cursor() as cursor:
             # note after postgresql 13 you can use 'DROP DATABASE name WITH (FORCE)'
             # but for now, we first close all possible open connections to the database, before dropping it
             # see: https://dba.stackexchange.com/questions/11893/force-drop-db-while-others-may-be-connected
             cursor.execute(f"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '{database_name}';")
             cursor.execute(f'DROP DATABASE {database_name};')
+    finally:
+        if conn:
+            conn.close()
 
 
 @pytest.fixture()