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.
This commit is contained in:
parent
f3b98f4fec
commit
00e10c6e67
|
@ -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)
|
||||
|
|
|
@ -1782,9 +1782,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))))))
|
||||
|
@ -2562,8 +2559,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
|
||||
|
@ -5305,9 +5301,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
|
||||
|
@ -5478,10 +5472,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
|
||||
|
@ -5870,10 +5861,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
|
||||
|
@ -8167,8 +8155,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
|
||||
|
@ -8918,8 +8905,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
|
||||
|
@ -8955,9 +8941,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
|
||||
|
@ -8994,8 +8978,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
|
||||
|
@ -9028,8 +9011,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))))))
|
||||
|
||||
|
@ -9078,8 +9060,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))))))
|
||||
|
||||
|
@ -9502,8 +9483,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
|
||||
|
@ -10896,9 +10876,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))))))
|
||||
|
@ -11407,8 +11384,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))))))
|
||||
|
@ -11567,8 +11543,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
|
||||
|
|
|
@ -1487,10 +1487,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
|
||||
|
|
Loading…
Reference in New Issue