gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b)

This patch contains the changes in all modules beside python.scm where
removing setuptools from the inputs could be achieved by removing complete
lines.

* gnu/packages/admin.scm (graphios, thefuck): Remove all [inputs],
  [native-inputs] and [propagated-inputs] where python-setuptools or
  python2-setuptools are the sole entries. Remove python-setuptools and
  python2-setuptools listed on a line by its own from [inputs],
  [native-inputs] and [propagated-inputs].
* gnu/packages/backup.scm (rdiff-backup): Likewise.
* gnu/packages/bioinformatics.scm (htseq, macs, python2-pbcore, rseqc,
  multiqc): Likewise.
* gnu/packages/django.scm (python-django, python2-django,
  python-django-simple-math-captcha, python2-django-simple-math-captcha):
  Likewise.
* gnu/packages/docker.scm (python-docker-py, docker-compose): Likewise.
* gnu/packages/game-development.scm (python-pygame): Likewise.
* gnu/packages/key-mon.scm (key-mon): Likewise.
* gnu/packages/mail.scm (khard): Likewise.
* gnu/packages/music.scm (beets, python2-pyechonest): Likewise.
* gnu/packages/openstack.scm (python-bandit, python2-bandit,
  python-debtcollector, python2-debtcollector,
  python-mox3, python2-mox3,
  python-os-client-config, python2-os-client-config,
  python-oslo.config, python2-oslo.config,
  python-oslo.context, python2-oslo.context,
  python-oslo.i18n, python2-oslo.i18n,
  python-oslo.serialization, python2-oslo.serialization,
  python-oslosphinx, python2-oslosphinx,
  python-oslotest, python2-oslotest,
  python-oslo.utils, python2-oslo.utils,
  python-swiftclient, python2-swiftclient): Likewise.
* gnu/packages/pdf.scm (pdfposter): Likewise.
* gnu/packages/tls.scm (python-acme, python2-acme): Likewise.
This commit is contained in:
Hartmut Goebel 2016-09-28 13:18:19 +02:00
parent f54d6bacbf
commit 5d85493284
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF
12 changed files with 0 additions and 45 deletions

View file

@ -1332,8 +1332,6 @@ (define-public graphios
(("/usr") out) (("/usr") out)
(("distro_ver = .*") "distro_ver = ''")) (("distro_ver = .*") "distro_ver = ''"))
#t)))))) #t))))))
(inputs
`(("python-setuptools" ,python2-setuptools)))
(home-page "https://github.com/shawn-sterling/graphios") (home-page "https://github.com/shawn-sterling/graphios")
(synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato") (synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato")
(description (description
@ -1699,8 +1697,6 @@ (define-public thefuck
(base32 (base32
"04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp")))) "04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs
`(("python-setuptools" ,python-setuptools)))
(inputs (inputs
`(("python-colorama" ,python-colorama) `(("python-colorama" ,python-colorama)
("python-decorator" ,python-decorator) ("python-decorator" ,python-decorator)

View file

@ -339,8 +339,6 @@ (define-public rdiff-backup
(base32 (base32
"1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d")))) "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(inputs (inputs
`(("python" ,python-2) `(("python" ,python-2)
("librsync" ,librsync))) ("librsync" ,librsync)))

View file

@ -2814,8 +2814,6 @@ (define-public htseq
`(("python-numpy" ,python2-numpy))) `(("python-numpy" ,python2-numpy)))
(inputs (inputs
`(("python-pysam" ,python2-pysam))) `(("python-pysam" ,python2-pysam)))
(native-inputs
`(("python-setuptools" ,python2-setuptools)))
(home-page "http://www-huber.embl.de/users/anders/HTSeq/") (home-page "http://www-huber.embl.de/users/anders/HTSeq/")
(synopsis "Analysing high-throughput sequencing data with Python") (synopsis "Analysing high-throughput sequencing data with Python")
(description (description
@ -3094,8 +3092,6 @@ (define-public macs
#:tests? #f)) ; no test target #:tests? #f)) ; no test target
(inputs (inputs
`(("python-numpy" ,python2-numpy))) `(("python-numpy" ,python2-numpy)))
(native-inputs
`(("python-setuptools" ,python2-setuptools)))
(home-page "http://github.com/taoliu/MACS/") (home-page "http://github.com/taoliu/MACS/")
(synopsis "Model based analysis for ChIP-Seq data") (synopsis "Model based analysis for ChIP-Seq data")
(description (description
@ -3521,7 +3517,6 @@ (define-public python2-pbcore
(native-inputs (native-inputs
`(("python-docutils" ,python2-docutils) `(("python-docutils" ,python2-docutils)
("python-nose" ,python2-nose) ("python-nose" ,python2-nose)
("python-setuptools" ,python2-setuptools)
("python-sphinx" ,python2-sphinx))) ("python-sphinx" ,python2-sphinx)))
(propagated-inputs (propagated-inputs
`(("python-pyxb" ,python2-pyxb))) `(("python-pyxb" ,python2-pyxb)))
@ -4028,7 +4023,6 @@ (define-public rseqc
`(("python-cython" ,python2-cython) `(("python-cython" ,python2-cython)
("python-pysam" ,python2-pysam) ("python-pysam" ,python2-pysam)
("python-numpy" ,python2-numpy) ("python-numpy" ,python2-numpy)
("python-setuptools" ,python2-setuptools)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("python-nose" ,python2-nose))) `(("python-nose" ,python2-nose)))
@ -7696,8 +7690,6 @@ (define-public multiqc
("python-click" ,python-click) ("python-click" ,python-click)
("python-matplotlib" ,python-matplotlib) ("python-matplotlib" ,python-matplotlib)
("python-numpy" ,python-numpy))) ("python-numpy" ,python-numpy)))
(native-inputs
`(("python-setuptools" ,python-setuptools)))
(home-page "http://multiqc.info") (home-page "http://multiqc.info")
(synopsis "Aggregate bioinformatics analysis reports") (synopsis "Aggregate bioinformatics analysis reports")
(description (description

View file

@ -54,10 +54,6 @@ (define-public python-django
(string-append ".:" (getenv "PYTHONPATH"))) (string-append ".:" (getenv "PYTHONPATH")))
(zero? (system* "python" "tests/runtests.py"))))))) (zero? (system* "python" "tests/runtests.py")))))))
;; TODO: Install extras/django_bash_completion. ;; TODO: Install extras/django_bash_completion.
(propagated-inputs
;; Django uses 'pkg_resources' (part of setuptools) to locate templates
;; at run-time.
`(("python-setuptools" ,python-setuptools)))
(native-inputs (native-inputs
`(("tzdata", tzdata) `(("tzdata", tzdata)
;; bcrypt and argon2-cffi are extra requirements not yet in guix ;; bcrypt and argon2-cffi are extra requirements not yet in guix
@ -112,8 +108,6 @@ (define-public python-django-simple-math-captcha
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-django" ,python-django))) `(("python-django" ,python-django)))
(native-inputs
`(("python-setuptools" ,python-setuptools)))
(home-page "https://github.com/alsoicode/django-simple-math-captcha") (home-page "https://github.com/alsoicode/django-simple-math-captcha")
(synopsis "Easy-to-use math field/widget captcha for Django forms") (synopsis "Easy-to-use math field/widget captcha for Django forms")
(description (description

View file

@ -42,7 +42,6 @@ (define-public python-docker-py
(arguments '(#:tests? #f)) (arguments '(#:tests? #f))
(inputs (inputs
`(("python-requests" ,python-requests) `(("python-requests" ,python-requests)
("python-setuptools" ,python-setuptools)
("python-six" ,python-six) ("python-six" ,python-six)
("python-websocket-client" ,python-websocket-client))) ("python-websocket-client" ,python-websocket-client)))
(home-page "https://github.com/docker/docker-py/") (home-page "https://github.com/docker/docker-py/")
@ -93,7 +92,6 @@ (define-public docker-compose
("python-jsonschema" ,python-jsonschema) ("python-jsonschema" ,python-jsonschema)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-requests" ,python-requests-2.7) ("python-requests" ,python-requests-2.7)
("python-setuptools" ,python-setuptools)
("python-six" ,python-six) ("python-six" ,python-six)
("python-texttable" ,python-texttable) ("python-texttable" ,python-texttable)
("python-websocket-client" ,python-websocket-client))) ("python-websocket-client" ,python-websocket-client)))

View file

@ -591,8 +591,6 @@ (define-public python-pygame
(string-append v4l-ref "/include/libv4l1-videodev.h") (string-append v4l-ref "/include/libv4l1-videodev.h")
"linux/videodev.h") "linux/videodev.h")
(system* "ln" "--symbolic" "Setup.in" "Setup"))))))) (system* "ln" "--symbolic" "Setup.in" "Setup")))))))
(native-inputs
`(("python-setuptools" ,python-setuptools)))
(inputs (inputs
`(("sdl" ,sdl) `(("sdl" ,sdl)
("sdl-image" ,sdl-image) ("sdl-image" ,sdl-image)

View file

@ -42,8 +42,6 @@ (define-public key-mon
(arguments (arguments
`(#:python ,python-2 ;uses the Python 2 'print' syntax `(#:python ,python-2 ;uses the Python 2 'print' syntax
#:tests? #f)) ;no tests #:tests? #f)) ;no tests
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(inputs (inputs
`(("python2-xlib" ,python2-xlib) `(("python2-xlib" ,python2-xlib)
("python2-pygtk" ,python2-pygtk) ("python2-pygtk" ,python2-pygtk)

View file

@ -1367,8 +1367,6 @@ (define-public khard
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(doc (string-append out "/share/doc/khard"))) (doc (string-append out "/share/doc/khard")))
(copy-recursively "misc/khard" doc))))))) (copy-recursively "misc/khard" doc)))))))
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(propagated-inputs (propagated-inputs
`(("python2-vobject" ,python2-vobject) `(("python2-vobject" ,python2-vobject)
("python2-pyyaml" ,python2-pyyaml) ("python2-pyyaml" ,python2-pyyaml)

View file

@ -1787,7 +1787,6 @@ (define-public python2-pyechonest
`(;; Python 3 is not supported: `(;; Python 3 is not supported:
;; https://github.com/echonest/pyechonest/issues/42 ;; https://github.com/echonest/pyechonest/issues/42
#:python ,python-2)) #:python ,python-2))
(native-inputs `(("python2-setuptools" ,python2-setuptools)))
(home-page "https://github.com/echonest/pyechonest") (home-page "https://github.com/echonest/pyechonest")
(synopsis "Python interface to The Echo Nest APIs") (synopsis "Python interface to The Echo Nest APIs")
(description "Pyechonest is a Python library for the Echo Nest API. With (description "Pyechonest is a Python library for the Echo Nest API. With
@ -1863,7 +1862,6 @@ (define-public beets
(native-inputs (native-inputs
`(("python2-beautifulsoup4" ,python2-beautifulsoup4) `(("python2-beautifulsoup4" ,python2-beautifulsoup4)
("python2-flask" ,python2-flask) ("python2-flask" ,python2-flask)
("python2-setuptools" ,python2-setuptools)
("python2-mock" ,python2-mock) ("python2-mock" ,python2-mock)
("python2-mpd2" ,python2-mpd2) ("python2-mpd2" ,python2-mpd2)
("python2-nose" ,python2-nose) ("python2-nose" ,python2-nose)

View file

@ -51,7 +51,6 @@ (define-public python-bandit
("python-stevedore" ,python-stevedore))) ("python-stevedore" ,python-stevedore)))
(inputs (inputs
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests ;; Tests
("python-fixtures" ,python-fixtures) ("python-fixtures" ,python-fixtures)
("python-mock" ,python-mock) ("python-mock" ,python-mock)
@ -88,7 +87,6 @@ (define-public python-debtcollector
(inputs (inputs
`(("python-babel" ,python-babel) `(("python-babel" ,python-babel)
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests. ;; Tests.
("python-oslotest" ,python-oslotest))) ("python-oslotest" ,python-oslotest)))
(home-page "http://www.openstack.org/") (home-page "http://www.openstack.org/")
@ -152,7 +150,6 @@ (define-public python-mox3
(native-inputs (native-inputs
`(("python-fixtures" ,python-fixtures) `(("python-fixtures" ,python-fixtures)
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
("python-six" ,python-six) ("python-six" ,python-six)
("python-testtools" ,python-testtools))) ("python-testtools" ,python-testtools)))
(home-page "http://www.openstack.org/") (home-page "http://www.openstack.org/")
@ -188,7 +185,6 @@ (define-public python-os-client-config
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-pyyaml" ,python-pyyaml) ("python-pyyaml" ,python-pyyaml)
("python-testrepository" ,python-testrepository) ("python-testrepository" ,python-testrepository)
("python-setuptools" ,python-setuptools)
("python-testscenarios" ,python-testscenarios) ("python-testscenarios" ,python-testscenarios)
("python-testtools" ,python-testtools))) ("python-testtools" ,python-testtools)))
(home-page "http://www.openstack.org/") (home-page "http://www.openstack.org/")
@ -384,7 +380,6 @@ (define-public python-oslo.config
("python-stevedore" ,python-stevedore))) ("python-stevedore" ,python-stevedore)))
(inputs (inputs
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests ;; Tests
("python-oslo.i18n" ,python-oslo.i18n) ("python-oslo.i18n" ,python-oslo.i18n)
("python-mock" ,python-mock) ("python-mock" ,python-mock)
@ -415,7 +410,6 @@ (define-public python-oslo.context
(inputs (inputs
`(("python-babel" ,python-babel) `(("python-babel" ,python-babel)
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests. ;; Tests.
("python-oslotest" ,python-oslotest))) ("python-oslotest" ,python-oslotest)))
(home-page "http://launchpad.net/oslo") (home-page "http://launchpad.net/oslo")
@ -446,7 +440,6 @@ (define-public python-oslo.i18n
("python-six" ,python-six))) ("python-six" ,python-six)))
(inputs (inputs
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests ;; Tests
("python-mock" ,python-mock) ("python-mock" ,python-mock)
("python-mox3" ,python-mox3) ("python-mox3" ,python-mox3)
@ -526,7 +519,6 @@ (define-public python-oslo.serialization
(inputs (inputs
`(("python-babel" ,python-babel) `(("python-babel" ,python-babel)
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests. ;; Tests.
("python-mock" ,python-mock) ("python-mock" ,python-mock)
("python-oslo.i18n" ,python-oslo.i18n) ("python-oslo.i18n" ,python-oslo.i18n)
@ -559,7 +551,6 @@ (define-public python-oslosphinx
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-docutils" ,python-docutils) ("python-docutils" ,python-docutils)
("python-hacking" ,python-hacking) ("python-hacking" ,python-hacking)
("python-setuptools" ,python-setuptools)
("python-sphinx" ,python-sphinx))) ("python-sphinx" ,python-sphinx)))
(home-page "http://www.openstack.org/") (home-page "http://www.openstack.org/")
(synopsis "OpenStack sphinx extensions and theme") (synopsis "OpenStack sphinx extensions and theme")
@ -594,7 +585,6 @@ (define-public python-oslotest
(inputs (inputs
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-os-client-config" ,python-os-client-config) ("python-os-client-config" ,python-os-client-config)
("python-setuptools" ,python-setuptools)
("python-subunit" ,python-subunit) ("python-subunit" ,python-subunit)
("python-testrepository" ,python-testrepository) ("python-testrepository" ,python-testrepository)
("python-testscenarios" ,python-testscenarios) ("python-testscenarios" ,python-testscenarios)
@ -638,7 +628,6 @@ (define-public python-oslo.utils
(inputs (inputs
`(("python-babel" ,python-babel) `(("python-babel" ,python-babel)
("python-pbr" ,python-pbr) ("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
;; Tests. ;; Tests.
("python-oslotest" ,python-oslotest) ("python-oslotest" ,python-oslotest)
("python-mock" ,python-mock) ("python-mock" ,python-mock)
@ -744,7 +733,6 @@ (define-public python-swiftclient
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("python-pbr" ,python-pbr) `(("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
;; The folloing packages are needed for the tests. ;; The folloing packages are needed for the tests.
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)

View file

@ -874,8 +874,6 @@ (define-public pdfposter
(inputs (inputs
;; pdfposter 0.6.0 still uses the old pyPdf ;; pdfposter 0.6.0 still uses the old pyPdf
`(("python2-pypdf" ,python2-pypdf))) `(("python2-pypdf" ,python2-pypdf)))
(native-inputs
`(("python2-setuptools" ,python2-setuptools)))
(home-page "https://pythonhosted.org/pdftools.pdfposter/") (home-page "https://pythonhosted.org/pdftools.pdfposter/")
(synopsis "Scale and tile PDF images/pages to print on multiple pages") (synopsis "Scale and tile PDF images/pages to print on multiple pages")
(description "@command{pdfposter} can be used to create a large poster by (description "@command{pdfposter} can be used to create a large poster by

View file

@ -462,7 +462,6 @@ (define-public python-acme
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput)
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
("python-setuptools" ,python-setuptools)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
(propagated-inputs (propagated-inputs
`(("python-ndg-httpsclient" ,python-ndg-httpsclient) `(("python-ndg-httpsclient" ,python-ndg-httpsclient)