From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 08/14] gnu: Remove python-setuptools and python2-setuptools from inputs (part 4) Date: Wed, 28 Sep 2016 15:58:21 +0200 Message-ID: <1475071107-10765-9-git-send-email-h.goebel@crazy-compilers.com> References: <1475071107-10765-1-git-send-email-h.goebel@crazy-compilers.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpFO2-0002MA-Ju for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpFO0-0006Te-7q for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:01 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:54174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpFNz-0006TY-U0 for guix-devel@gnu.org; Wed, 28 Sep 2016 09:59:00 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3skfSg0vF1z3hjVc for ; Wed, 28 Sep 2016 15:58:59 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3skfSg0lZfzvl3F for ; Wed, 28 Sep 2016 15:58:59 +0200 (CEST) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id Eh8ywnL9PS-c for ; Wed, 28 Sep 2016 15:58:56 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-146-208.dynamic.mnet-online.de [188.174.146.208]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Wed, 28 Sep 2016 15:58:56 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 536A860AF5 for ; Wed, 28 Sep 2016 15:58:28 +0200 (CEST) In-Reply-To: <1475071107-10765-1-git-send-email-h.goebel@crazy-compilers.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 This are the cases where setuptools are used in an inherited package and removing this input keeps the need for inheriting the package. * gnu/packages/bioinformatics.scm * gnu/packages/python.scm * gnu/packages/statistics.scm --- gnu/packages/bioinformatics.scm | 4 +--- gnu/packages/python.scm | 51 +++++++++++------------------------------ gnu/packages/statistics.scm | 5 +--- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 611cbb6..2526ccc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -524,9 +524,7 @@ e.g. microbiome samples, genomes, metagenomes.") (substitute* "setup.py" (("install_requires.append\\(\"pyqi\"\\)") "pass")) #t))) - ,@(package-arguments base))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + ,@(package-arguments base)))))) (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1cb188..f61b1b9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1716,9 +1716,6 @@ same arguments.") (let ((base (package-with-python2 (strip-python2-variant python-pytest-mock)))) (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base))) (inputs `(("python2-mock" ,python2-mock) ,@(package-inputs base)))))) @@ -2476,8 +2473,7 @@ OAuth request-signing logic.") (let ((base (package-with-python2 (strip-python2-variant python-oauthlib)))) (package (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-native-inputs base)))))) (define-public python-itsdangerous @@ -4843,9 +4839,7 @@ and statistical routines from scipy and statsmodels.") (package (inherit base) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs base))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + ,@(package-propagated-inputs base)))))) (define-public python-sympy (package @@ -4987,10 +4981,7 @@ connection to each user.") `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) ("python2-singledispatch" ,python2-singledispatch) - ,@(package-inputs tornado))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs tornado)))))) + ,@(package-inputs tornado)))))) ;; the python- version can be removed with python-3.5 (define-public python-backports-abc @@ -5381,10 +5372,7 @@ term.js Javascript terminal emulator library.") (propagated-inputs `(("python2-backport-ssl-match-hostname" ,python2-backport-ssl-match-hostname) - ,@(package-propagated-inputs terminado))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs terminado)))))) + ,@(package-propagated-inputs terminado)))))) (define-public python-fonttools (package @@ -7325,8 +7313,7 @@ authenticated session objects providing things like keep-alive.") (let ((base (package-with-python2 (strip-python2-variant python-rauth)))) (package (inherit base) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-native-inputs base)))))) (define-public python2-functools32 @@ -8057,8 +8044,7 @@ and provides a uniform API regardless of which JSON implementation is used.") (arguments `(;; Unlike the python 3 variant, we do run tests. See above! #:tests? #t ,@(package-arguments anyjson))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-nose" ,python2-nose)))))) + (native-inputs `(("python2-nose" ,python2-nose)))))) (define-public python-amqp (package @@ -8094,9 +8080,7 @@ alternative when librabbitmq is not available.") ;; unmaintained. Weirdly, does not do this on the python 3 ;; version? #:tests? #f - ,@(package-arguments amqp))) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs amqp)))))) + ,@(package-arguments amqp)))))) (define-public python-kombu (package @@ -8132,8 +8116,7 @@ RabbitMQ messaging server is the most popular implementation.") (strip-python2-variant python-kombu)))) (package (inherit kombu) - (inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (inputs `(("python2-unittest2" ,python2-unittest2) ,@(package-inputs kombu)))))) (define-public python-billiard @@ -8166,8 +8149,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.") (strip-python2-variant python-billiard)))) (package (inherit billiard) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs billiard)))))) @@ -8207,8 +8189,7 @@ synchronously (wait until ready).") (strip-python2-variant python-celery)))) (package (inherit celery) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unittest2" ,python2-unittest2) + (native-inputs `(("python2-unittest2" ,python2-unittest2) ("python2-mock" ,python2-mock) ,@(package-native-inputs celery)))))) @@ -8558,8 +8539,7 @@ encoding algorithms to do fuzzy string matching.") (let ((jellyfish (package-with-python2 (strip-python2-variant python-jellyfish)))) (package (inherit jellyfish) - (native-inputs `(("python2-setuptools" ,python2-setuptools) - ("python2-unicodecsv" ,python2-unicodecsv) + (native-inputs `(("python2-unicodecsv" ,python2-unicodecsv) ,@(package-native-inputs jellyfish)))))) (define-public python2-unicodecsv @@ -9948,9 +9928,6 @@ binary or text.") (define-public python2-binaryornot (let ((base (package-with-python2 (strip-python2-variant python-binaryornot)))) (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base))) (inputs `(("python2-enum34" ,python2-enum34) ,@(package-inputs base)))))) @@ -10453,8 +10430,7 @@ functionality in the command line.") (let ((base (package-with-python2 (strip-python2-variant python-natsort)))) (package (inherit base) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-pathlib" ,python2-pathlib) + `(("python2-pathlib" ,python2-pathlib) ("python2-mock" ,python2-mock) ("python2-enum34" ,python2-enum34) ,@(package-native-inputs base)))))) @@ -10612,8 +10588,7 @@ with an associated set of resolve methods that know how to fetch data.") (strip-python2-variant python-graphene)))) (package (inherit base) (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ("python2-sqlalchemy" ,python2-sqlalchemy) + `(("python2-sqlalchemy" ,python2-sqlalchemy) ,@(package-native-inputs base)))))) (define-public python-nautilus diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9cf79ef..79dbcc1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1475,10 +1475,7 @@ inference for statistical models.") ("python2-scipy" ,python2-scipy) ("python2-pandas" ,python2-pandas) ("python2-patsy" ,python2-patsy) - ("python2-matplotlib" ,python2-matplotlib))) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs stats)))))) + ("python2-matplotlib" ,python2-matplotlib)))))) (define-public r-coda (package -- 2.7.4