From f0250bb39b268b36e020d7a93a09a0266a1ddb69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Tue, 8 Aug 2017 08:19:23 +0200 Subject: [PATCH] Use psycopg2cffi for PyPy compatibility --- makefile | 2 +- mygpo/settings.py | 7 +++++++ requirements.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index b38b67f0..da055b28 100644 --- a/makefile +++ b/makefile @@ -19,7 +19,7 @@ clean: install-deps: sudo apt-get install libpq-dev libjpeg-dev zlib1g-dev libwebp-dev \ - build-essential python3-dev virtualenv + build-essential python3-dev virtualenv libffi-dev .PHONY: all help test clean unittest coverage install-deps diff --git a/mygpo/settings.py b/mygpo/settings.py index 2cc7e2ca..ce799883 100644 --- a/mygpo/settings.py +++ b/mygpo/settings.py @@ -4,6 +4,13 @@ import os.path import dj_database_url +try: + from psycopg2cffi import compat + compat.register() +except ImportError: + pass + + BASE_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/requirements.txt b/requirements.txt index cb9f7e65..98a4042a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ gunicorn==19.7.1 html2text==2016.9.19 markdown2==2.3.4 oauth2client==4.1.1 -psycopg2==2.7.1 +psycopg2cffi==2.7.6 pyes==0.99.6 python-dateutil==2.6.0 redis==2.10.5 -- 2.11.4.GIT