From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH 2/5] import: pypi: Remove setuptools from the inputs. Date: Sat, 16 Jul 2016 17:23:22 +0200 Message-ID: <1468682605-12622-3-git-send-email-tipecaml@gmail.com> References: <1468682605-12622-1-git-send-email-tipecaml@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bORRL-0006Bd-IX for guix-devel@gnu.org; Sat, 16 Jul 2016 11:23:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bORRJ-0003iO-CJ for guix-devel@gnu.org; Sat, 16 Jul 2016 11:23:38 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bORRJ-0003iH-4U for guix-devel@gnu.org; Sat, 16 Jul 2016 11:23:37 -0400 Received: by mail-wm0-x244.google.com with SMTP id q128so6112664wma.1 for ; Sat, 16 Jul 2016 08:23:37 -0700 (PDT) In-Reply-To: <1468682605-12622-1-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: guix-devel@gnu.org * guix/import/pypi.scm (compute-inputs): remove python-setuptools from the inputs. * tests/pypi.scm ("pypi->guix-package", "pypi->guix-package, wheels"): Update accordingly. --- guix/import/pypi.scm | 7 +++---- tests/pypi.scm | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 474974b..af9b108 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -232,10 +232,9 @@ name/variable pairs describing the required inputs of this package." (sort (map (lambda (input) (list input (list 'unquote (string->symbol input)))) - (append '("python-setuptools") - ;; Argparse has been part of Python since 2.7. - (remove (cut string=? "python-argparse" <>) - (guess-requirements source-url wheel-url tarball)))) + ;; Argparse has been part of Python since 2.7. + (remove (cut string=? "python-argparse" <>) + (guess-requirements source-url wheel-url tarball))) (lambda args (match args (((a _ ...) (b _ ...)) diff --git a/tests/pypi.scm b/tests/pypi.scm index ef43d50..7f0ad23 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -109,8 +109,7 @@ baz > 13.37") ('propagated-inputs ('quasiquote (("python-bar" ('unquote 'python-bar)) - ("python-baz" ('unquote 'python-baz)) - ("python-setuptools" ('unquote 'python-setuptools))))) + ("python-baz" ('unquote 'python-baz))))) ('home-page "http://example.com") ('synopsis "summary") ('description "summary") @@ -169,8 +168,7 @@ baz > 13.37") ('propagated-inputs ('quasiquote (("python-bar" ('unquote 'python-bar)) - ("python-baz" ('unquote 'python-baz)) - ("python-setuptools" ('unquote 'python-setuptools))))) + ("python-baz" ('unquote 'python-baz))))) ('home-page "http://example.com") ('synopsis "summary") ('description "summary") -- 2.6.2