From 56c9edd3281d0f674c8bfe5f1f6cde669d07ac91 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 14 Dec 2020 15:11:41 +0100 Subject: [PATCH] removed deprecated psycopg2 --- .env.template | 2 +- cookbook/views/views.py | 2 +- requirements.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.env.template b/.env.template index d3038270..66c9d982 100644 --- a/.env.template +++ b/.env.template @@ -12,7 +12,7 @@ SECRET_KEY= TIMEZONE=Europe/Berlin # add only a database password if you want to run with the default postgres, otherwise change settings accordingly -DB_ENGINE=django.db.backends.postgresql_psycopg2 +DB_ENGINE=django.db.backends.postgresql POSTGRES_HOST=db_recipes POSTGRES_PORT=5432 POSTGRES_USER=djangodb diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 4be75c4b..c07b77b9 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -243,7 +243,7 @@ def history(request): @group_required('admin') def system(request): - postgres = False if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2' else True + postgres = False if (settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2' or settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql') else True secret_key = False if os.getenv('SECRET_KEY') else True diff --git a/requirements.txt b/requirements.txt index 14d06c01..f2dc6bde 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,6 @@ gunicorn==20.0.4 lxml==4.6.2 Markdown==3.3.3 Pillow==8.0.1 -psycopg2-binary==2.8.6 python-dotenv==0.15.0 requests==2.25.0 simplejson==3.17.2