From 13b2660e8bb8ed5f20caef49537e7f2eb6d7458c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Rodr=C3=ADguez?= Date: Wed, 15 Nov 2017 17:53:45 +0100 Subject: [PATCH] xenial ss: remove psycopg dependency Related to #62. Also, enable pip index to workaround #84, a we do in trusty --- debs/xenial/archivematica-storage-service/Dockerfile | 2 +- .../patches/remove-psycopg-requirement.diff | 10 ++++++++++ .../debian-storage-service/patches/series | 1 + .../debian-storage-service/rules | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff create mode 100644 debs/xenial/archivematica-storage-service/debian-storage-service/patches/series diff --git a/debs/xenial/archivematica-storage-service/Dockerfile b/debs/xenial/archivematica-storage-service/Dockerfile index eafeaa2b..c314dc33 100644 --- a/debs/xenial/archivematica-storage-service/Dockerfile +++ b/debs/xenial/archivematica-storage-service/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial RUN apt-get update && \ apt-get install -y dpkg-dev git build-essential wget debhelper \ - devscripts equivs + devscripts equivs quilt RUN wget -O /tmp/pip.py https://bootstrap.pypa.io/get-pip.py && python /tmp/pip.py diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff new file mode 100644 index 00000000..c3f1ebf1 --- /dev/null +++ b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff @@ -0,0 +1,10 @@ +Index: archivematica-storage-service/requirements/production.txt +=================================================================== +--- archivematica-storage-service.orig/requirements/production.txt ++++ archivematica-storage-service/requirements/production.txt +@@ -6,4 +6,3 @@ + # in all cases (i.e. test.txt doesn't need them, but local and production do) + dj-database-url==0.4.2 + mysqlclient==1.3.8 +-psycopg2==2.7.1 +\ No newline at end of file diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series new file mode 100644 index 00000000..db2dfea5 --- /dev/null +++ b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series @@ -0,0 +1 @@ +remove-psycopg-requirement.diff diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/rules b/debs/xenial/archivematica-storage-service/debian-storage-service/rules index 5d296c7e..b8f9d987 100755 --- a/debs/xenial/archivematica-storage-service/debian-storage-service/rules +++ b/debs/xenial/archivematica-storage-service/debian-storage-service/rules @@ -4,4 +4,4 @@ dh $@ --with python-virtualenv --with systemd override_dh_virtualenv: - dh_virtualenv --extra-pip-arg --no-index --extra-pip-arg --find-links=lib + dh_virtualenv --extra-pip-arg --find-links=lib