From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Allan Webber Subject: Re: [PATCH v2] gnu: Add python-psycopg2, python2-psycopg2 Date: Wed, 24 Feb 2016 16:05:43 -0800 Message-ID: <87vb5dr6wx.fsf@dustycloud.org> References: <20160219120106.62631a44@scratchpost.org> <20160219212258.GA4418@jasmine> <20160222013949.186f25bc@scratchpost.org> <87egc54gg4.fsf@dustycloud.org> <20160224233918.3d70dd72@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYjRF-000281-Pw for guix-devel@gnu.org; Wed, 24 Feb 2016 19:05:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYjRB-00071A-Rh for guix-devel@gnu.org; Wed, 24 Feb 2016 19:05:49 -0500 Received: from dustycloud.org ([50.116.34.160]:54816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYjRB-00070A-NY for guix-devel@gnu.org; Wed, 24 Feb 2016 19:05:45 -0500 In-reply-to: <20160224233918.3d70dd72@scratchpost.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Danny Milosavljevic Cc: guix-devel This looks pretty good. And happily, I've tested with MediaGoblin, and it works! Horray! A few things... Danny Milosavljevic writes: > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 55a62a9..e1dbc31 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -17,6 +17,7 @@ Could you use `git format-patch` to generate this patch instead? Probably `git format-patch HEAD...origin/master` will work. You can look at the commit log to see the desired format, or read the Change Log section of the GNU coding standards: https://www.gnu.org/prep/standards/html_node/Change-Logs.html > ;;; Copyright =C2=A9 2015, 2016 Efraim Flashner > ;;; Copyright =C2=A9 2015 Kyle Meyer > ;;; Copyright =C2=A9 2015 Chris Marusich > +;;; Copyright =C2=A9 2016 Danny Milosavljevic > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances= in code.") > =20 > (define-public python2-sphinx-repoze-autointerface > (package-with-python2 python-sphinx-repoze-autointerface)) > + > +(define-public python-psycopg2 > + (package > + (name "python-psycopg2") > + (version "2.6.1") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "psycopg2" version)) > + (sha256 > + (base32 > + "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva")))) > + (build-system python-build-system) > + (arguments > + `(#:tests? #f)) ; TODO re-enable after providing a test-db. > + ; Tests would require a postgresql database "psycopg2_test" > + ; and a running postgresql database management service. ; comments comment a line, to the right of the line, so the #:tests? line has it right. However, the other ones should use two comments. It might even be nicer if it goes to the right, like: (arguments ;; Tests would require a postgresql database "psycopg2_test" ;; and a running postgresql database management service. `(#:tests? #f)) ; TODO re-enable after providing a test-db. or: (arguments `(;; Tests would require a postgresql database "psycopg2_test" ;; and a running postgresql database management service. #:tests? #f)) ; TODO re-enable after providing a test-db. > + (inputs > + `(("postgresql" ,postgresql))) ; libpq > + (home-page "http://initd.org/psycopg/") > + (synopsis "Python PostgreSQL adapter") > + (description > + "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-= API 2.0.") > + (license lgpl3+) > + (properties `((python2-variant . ,(delay python2-psycopg2)))))) > + > +(define-public python2-psycopg2 > + (package > + (inherit (package-with-python2 > + (strip-python2-variant python-psycopg2))) > + (native-inputs `(("python2-setuptools" ,python2-setuptools)))))