[change] Upgraded from psycopg2 to psycopg 3

Author: pandafy

images/common/services.py

@@ -8,8 +8,10 @@
 
 
 def database_status():
+    import psycopg
+
     try:
-        psycopg2.connect(
+        with psycopg.connect(
             dbname=os.environ["DB_NAME"],
             user=os.environ["DB_USER"],
             password=os.environ["DB_PASS"],
@@ -19,8 +21,9 @@ def database_status():
             sslcert=os.environ["DB_SSLCERT"],
             sslkey=os.environ["DB_SSLKEY"],
             sslrootcert=os.environ["DB_SSLROOTCERT"],
-        )
-    except psycopg2.OperationalError:
+        ):
+            pass
+    except psycopg.OperationalError:
         time.sleep(3)
         return False
     else:
@@ -74,8 +77,6 @@ def redis_status():
     arguments = sys.argv[1:]
     # Database Connection
     if "database" in arguments:
-        import psycopg2
-
         print("Waiting for database to become available...")
         connected = False
         while not connected:

images/openwisp_base/requirements.txt

@@ -1,7 +1,9 @@
 channels_redis
 service_identity
 django-redis
-psycopg2
+# pool is useful in prod deployments we include it
+# by default, but has to be configured manually
+psycopg[binary,pool]<4.0.0
 sentry-sdk
 supervisor>=4.3.0,<4.4.0
 django-cors-headers>=4.9.0,<4.10.0