From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 09/10] gnu: Add python-cliff. Date: Sat, 30 Apr 2016 17:33:45 -0400 Message-ID: <20160430213345.GA32628@jasmine> References: <1461939663-5936-1-git-send-email-tipecaml@gmail.com> <1461939663-5936-10-git-send-email-tipecaml@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awcWj-000860-56 for guix-devel@gnu.org; Sat, 30 Apr 2016 17:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awcWV-0003CG-BQ for guix-devel@gnu.org; Sat, 30 Apr 2016 17:34:07 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:35623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awcWT-000347-3I for guix-devel@gnu.org; Sat, 30 Apr 2016 17:33:59 -0400 Content-Disposition: inline In-Reply-To: <1461939663-5936-10-git-send-email-tipecaml@gmail.com> 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" To: Cyril Roelandt Cc: guix-devel@gnu.org On Fri, Apr 29, 2016 at 04:21:02PM +0200, Cyril Roelandt wrote: > * gnu/packages/openstack.scm (python-cliff, python2-cliff): New variables. > * gnu/packages/patches/python-cliff-remove-unicodecsv.patch: New file. > * gnu/local.mk: Add it here. Can you mention (dist_patch_DATA)? > + (native-inputs > + `(("python-coverage" ,python-coverage) > + ("python-httplib2" ,python-httplib2) > + ("python-mock" ,python-mock) > + ("python-oslosphinx" ,python-oslosphinx) > + ("python-pbr" ,python-pbr) > + ("python-setuptools" ,python-setuptools) Did you try putting setuptools in the python-2 variant? > diff --git a/gnu/packages/patches/python-cliff-remove-unicodecsv.patch b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch Can you add a couple lines explaining the patch for future readers? > new file mode 100644 > index 0000000..99b4aa2 > --- /dev/null > +++ b/gnu/packages/patches/python-cliff-remove-unicodecsv.patch > @@ -0,0 +1,11 @@ > +diff --git a/requirements.txt b/requirements.txt > +index f334651..c16761e 100644 > +--- a/requirements.txt > ++++ b/requirements.txt > +@@ -7,5 +7,5 @@ PrettyTable<0.8,>=0.7 # BSD > + pyparsing>=2.0.1 # MIT > + six>=1.9.0 # MIT > + stevedore>=1.5.0 # Apache-2.0 > +-unicodecsv>=0.8.0 # BSD > ++unicodecsv>=0.8.0;python_version<='2.7'# BSD > + PyYAML>=3.1.0 # MIT > -- > 2.6.2 > >