[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/97: gnu: Remove python-setuptools and python2-setuptools from inputs
From: |
Hartmut Goebel |
Subject: |
14/97: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3) |
Date: |
Tue, 18 Oct 2016 20:13:16 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 94511746bca78845bf6f288ca29c27a9c87ce8b4
Author: Hartmut Goebel <address@hidden>
Date: Wed Sep 28 13:31:42 2016 +0200
gnu: Remove python-setuptools and python2-setuptools from inputs (part 3)
This patch contains the changes where setuptools are used in an inherited
package and removing this input keeps the need for inheriting the package.
* gnu/packages/bioinformatics.scm(python2-biom-format): Remove
python-setuptools respective python2-setuptools from [inputs],
[native-inputs] and [propagated-inputs] in Python 2 packages inheriting
from
a Python 3 package.
* gnu/packages/python.scm(python2-pytest-mock,
python2-oauthlib,
python2-seaborn,
python2-tornado,
python2-terminado,
python2-rauth,
python2-anyjson,
python2-amqp,
python2-kombu,
python2-billiard,
python2-celery,
python2-jellyfish,
python2-binaryornot,
python2-natsort,
python2-graphene): Likewise.
* gnu/packages/statistics.scm(python2-statsmodels): Likewise.
---
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 5024ba7..9400174 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -584,9 +584,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 466165b..b0a97f6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1709,9 +1709,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))))))
@@ -2477,8 +2474,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
@@ -4872,9 +4868,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
@@ -5045,10 +5039,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
@@ -5439,10 +5430,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
@@ -7407,8 +7395,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
@@ -8139,8 +8126,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
@@ -8176,9 +8162,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
@@ -8214,8 +8198,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
@@ -8248,8 +8231,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))))))
@@ -8289,8 +8271,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))))))
@@ -8673,8 +8654,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
@@ -10063,9 +10043,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))))))
@@ -10568,8 +10545,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))))))
@@ -10727,8 +10703,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 959251d..f6ad081 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
- 05/97: guix: python-build-system: Add option "#:use-setuptools?" (default true)., (continued)
- 05/97: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/18
- 06/97: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/18
- 10/97: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/18
- 17/97: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/18
- 20/97: gnu: python-pytest: Propagate input "python-py"., Hartmut Goebel, 2016/10/18
- 19/97: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/18
- 08/97: gnu: python-2.7: Add all guix prefixes in PYTHONPATH to site-prefixes., Hartmut Goebel, 2016/10/18
- 09/97: guix: Add lint-checker for packages which should be no inputs at all., Hartmut Goebel, 2016/10/18
- 21/97: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/18
- 25/97: inputs -> propagated-inputs: special, Hartmut Goebel, 2016/10/18
- 14/97: gnu: Remove python-setuptools and python2-setuptools from inputs (part 3),
Hartmut Goebel <=
- 26/97: gnu: python-sphinx-rtd-theme: Remove inputs., Hartmut Goebel, 2016/10/18
- 32/97: gnu: python-h5py: Remove needless "python2-variant" property., Hartmut Goebel, 2016/10/18
- 24/97: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., Hartmut Goebel, 2016/10/18
- 18/97: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)., Hartmut Goebel, 2016/10/18
- 34/97: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/18
- 23/97: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., Hartmut Goebel, 2016/10/18
- 28/97: make native-inputs: simple ones: one nose, docuitls, phinx, tests, …, Hartmut Goebel, 2016/10/18
- 33/97: gnu: python-hdf5: Correct inputs., Hartmut Goebel, 2016/10/18
- 30/97: gnu: python-ccm: Add missing input python-psutil., Hartmut Goebel, 2016/10/18
- 40/97: gnu: python-pytest-flakes: Fix build., Hartmut Goebel, 2016/10/18