Merge pull request #2753 from phillxnet/2740-update-to-psycopg-3

update to latest psycopg 3 #2740
rockstor · Nov 22, 2023 · 75d7cf6 · 75d7cf6
2 parents 84a0573 + d32ad02
commit 75d7cf6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -67,8 +67,7 @@ django-pipeline = "*"
 python-engineio = "==4.8.0"
 python-socketio = "==5.9.0"
 dbus-python = "*"
-# N.B. officially Django >= 2.2.1 is required for psycopg2 >= 2.8
-psycopg2 = "==2.8.6"  # last Python 2.7 version, PostgreSQL 13 errorcodes map?
+psycopg = "~3"
 psycogreen = "==1.0"
 gevent = "*"  # can be an extra dependency to gunicorn.
 gunicorn = "*"

diff --git a/src/rockstor/settings.py b/src/rockstor/settings.py
@@ -32,15 +32,15 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": "storageadmin",  # Or path to database file if using sqlite3.
         "USER": "rocky",  # Not used with sqlite3.
         "PASSWORD": "rocky",  # Not used with sqlite3.
         "HOST": "",  # Set to empty string for localhost. Not used with sqlite3.
         "PORT": "",  # Set to empty string for default. Not used with sqlite3.
     },
     "smart_manager": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": "smartdb",
         "USER": "rocky",
         "PASSWORD": "rocky",