Update psycopg2 to psycopg (v3) (#5161)

WordPress · Nov 13, 2024 · 4293f21 · 4293f21
1 parent 0fe2eb4
commit 4293f21
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 35 deletions.
diff --git a/indexer_worker/indexer_worker/db_helpers.py b/indexer_worker/indexer_worker/db_helpers.py
@@ -2,7 +2,7 @@
 import time
 from typing import NamedTuple
 
-import psycopg2
+import psycopg
 from decouple import config
 
 
@@ -43,10 +43,10 @@ def database_connect(
     """
     while True:
         try:
-            conn = psycopg2.connect(**dbconfig._asdict(), connect_timeout=timeout)
+            conn = psycopg.connect(**dbconfig._asdict(), connect_timeout=timeout)
             if autocommit:
                 conn.set_session(autocommit=True)
-        except psycopg2.OperationalError as e:
+        except psycopg.OperationalError as e:
             if not attempt_reconnect:
                 return None
             log.exception(e)

diff --git a/indexer_worker/indexer_worker/queries.py b/indexer_worker/indexer_worker/queries.py
@@ -1,4 +1,4 @@
-from psycopg2.sql import SQL, Identifier, Literal
+from psycopg.sql import SQL, Identifier, Literal
 
 
 def get_existence_queries(model_name: str, table_name: str) -> tuple[SQL, SQL]:

diff --git a/indexer_worker/pdm.lock b/indexer_worker/pdm.lock
diff --git a/indexer_worker/pyproject.toml b/indexer_worker/pyproject.toml
@@ -19,7 +19,7 @@ dependencies = [
     "filelock ~= 3.13",
     "gunicorn ~= 22.0",
     "jsonschema ~= 4.19",
-    "psycopg2 ~= 2.9",
+    "psycopg >=3.2.3, <4",
     "python-decouple ~= 3.8",
     "PyYAML ~= 6.0",
     "tldextract ~= 5.0",
@@ -32,11 +32,13 @@ distribution = false
 [tool.pdm.dev-dependencies]
 dev = [
     "ipython~=8.16",
+    "remote-pdb~=2.1",
+]
+test = [
+    "pook~=2.0",
     "pytest~=8.3",
     "pytest-order~=1.1",
     "pytest-sugar~=1.0",
-    "remote-pdb~=2.1",
-    "pook~=2.0",
 ]
 
 [build-system]