From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Add python-psycopg2, python2-psycopg2 Date: Fri, 19 Feb 2016 16:22:58 -0500 Message-ID: <20160219212258.GA4418@jasmine> References: <20160219120106.62631a44@scratchpost.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWsW2-0002dr-DR for guix-devel@gnu.org; Fri, 19 Feb 2016 16:23:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWsVx-0007ET-Cz for guix-devel@gnu.org; Fri, 19 Feb 2016 16:23:06 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWsVx-0007ED-8m for guix-devel@gnu.org; Fri, 19 Feb 2016 16:23:01 -0500 Content-Disposition: inline In-Reply-To: <20160219120106.62631a44@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 On Fri, Feb 19, 2016 at 12:01:06PM +0100, Danny Milosavljevic wrote: > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm Thanks for the patch! Unfortunately, python.scm has changed since you made the patch, so the patch no longer applies. Can you rebase on the current master and regenerate the patch, incorporating the changes suggest below? The commit message should include a line describing the changes. You can find some examples of the desired format in the git log. And don't forget to add your name to the list of authors at the top of the file :) > index 3dd3862..f121d27 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -7529,3 +7529,32 @@ available in Django, but is a standalone package.") > (inherit (package-with-python2 > (strip-python2-variant python-wtforms))) > (inputs `(("python2-setuptools" ,python2-setuptools))))) > + > +(define-public python-psycopg2 > + (package > + (name "python-psycopg2") > + (version "2.6.1") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "psycopg2" version ".tar.gz")) ".tar.gz" is the default pypi-uri extension, so you can leave it out. > + (sha256 > + (base32 > + "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva")))) > + (build-system python-build-system) > + (arguments > + `(#:tests? #f)) ; TODO re-enable Why are the tests disabled? > + (inputs > + `(("postgresql" ,postgresql))) ; libpq > + (home-page "http://initd.org/psycopg/") > + (synopsis "Python PostgreSQL adapter") > + (description > + "psycopg2 is a PostgreSQL adapter that implements DB-API 2.0") The description should be a complete sentence, with a period at the end. Bonus points for more detail :) > + (license lgpl3+) > + (properties `((python2-variant . ,(delay python2-psycopg2)))))) > + > +(define-public python2-psycopg2 > + (package > + (inherit (package-with-python2 > + (strip-python2-variant python-psycopg2))) > + (inputs `(("python2-setuptools" ,python2-setuptools))))) Setuptools is typically used only at build time, so it should be a native input.