htgoebel pushed a commit to branch wip-python-build-system
in repository guix.

commit e2ae76ba73c6cc9a6b8472aa361d3c3dc187f86d
Author: Hartmut Goebel <h.goe...@crazy-compilers.com>
Date:   Wed Sep 28 13:18:19 2016 +0200

    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: Remove all inputs, native-inputs and
      propagated-inputs where python-setuptools and 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: Likewise.
    * gnu/packages/bioinformatics.scm: Likewise.
    * gnu/packages/django.scm: Likewise.
    * gnu/packages/docker.scm: Likewise.
    * gnu/packages/game-development.scm: Likewise.
    * gnu/packages/key-mon.scm: Likewise.
    * gnu/packages/mail.scm: Likewise.
    * gnu/packages/music.scm: Likewise.
    * gnu/packages/openstack.scm: Likewise.
    * gnu/packages/tls.scm: Likewise.
---
 gnu/packages/admin.scm            |    4 ----
 gnu/packages/backup.scm           |    2 --
 gnu/packages/bioinformatics.scm   |    8 --------
 gnu/packages/django.scm           |    6 ------
 gnu/packages/docker.scm           |    2 --
 gnu/packages/game-development.scm |    2 --
 gnu/packages/key-mon.scm          |    2 --
 gnu/packages/mail.scm             |    2 --
 gnu/packages/music.scm            |    1 -
 gnu/packages/openstack.scm        |   12 ------------
 gnu/packages/tls.scm              |    1 -
 11 files changed, 42 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index d9b08ef..f0df5ff 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1332,8 +1332,6 @@ specified directories.")
                 (("/usr") out)
                 (("distro_ver = .*") "distro_ver = ''"))
               #t))))))
-   (inputs
-    `(("python-setuptools" ,python2-setuptools)))
    (home-page "https://github.com/shawn-sterling/graphios";)
    (synopsis "Emit Nagios metrics to Graphite, Statsd, and Librato")
    (description
@@ -1693,8 +1691,6 @@ throughput (in the same interval).")
                (base32
                 "04q2cn8c83f6z6wn1scla1ilrpi5ssjc64987hvmwfvwvb82bvkp"))))
     (build-system python-build-system)
-    (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
     (inputs
      `(("python-colorama" ,python-colorama)
        ("python-decorator" ,python-decorator)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 797c06e..c56e4e8 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -346,8 +346,6 @@ errors.")
         (base32
          "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"))))
     (build-system python-build-system)
-    (native-inputs
-     `(("python2-setuptools" ,python2-setuptools)))
     (inputs
      `(("python" ,python-2)
        ("librsync" ,librsync)))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5fbfdf0..b2631ff 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2803,8 +2803,6 @@ HMMs).")
      `(("python-numpy" ,python2-numpy)))
     (inputs
      `(("python-pysam" ,python2-pysam)))
-    (native-inputs
-     `(("python-setuptools" ,python2-setuptools)))
     (home-page "http://www-huber.embl.de/users/anders/HTSeq/";)
     (synopsis "Analysing high-throughput sequencing data with Python")
     (description
@@ -3083,8 +3081,6 @@ data.")
        #:tests? #f)) ; no test target
     (inputs
      `(("python-numpy" ,python2-numpy)))
-    (native-inputs
-     `(("python-setuptools" ,python2-setuptools)))
     (home-page "http://github.com/taoliu/MACS/";)
     (synopsis "Model based analysis for ChIP-Seq data")
     (description
@@ -3510,7 +3506,6 @@ interrupted by stop codons.  OrfM finds and prints these 
ORFs.")
     (native-inputs
      `(("python-docutils" ,python2-docutils)
        ("python-nose" ,python2-nose)
-       ("python-setuptools" ,python2-setuptools)
        ("python-sphinx" ,python2-sphinx)))
     (propagated-inputs
      `(("python-pyxb" ,python2-pyxb)))
@@ -4017,7 +4012,6 @@ BAM and Wiggle files in both transcript-coordinate and 
genomic-coordinate.")
      `(("python-cython" ,python2-cython)
        ("python-pysam" ,python2-pysam)
        ("python-numpy" ,python2-numpy)
-       ("python-setuptools" ,python2-setuptools)
        ("zlib" ,zlib)))
     (native-inputs
      `(("python-nose" ,python2-nose)))
@@ -7401,8 +7395,6 @@ replacement for strverscmp.")
        ("python-click" ,python-click)
        ("python-matplotlib" ,python-matplotlib)
        ("python-numpy" ,python-numpy)))
-    (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
     (home-page "http://multiqc.info";)
     (synopsis "Aggregate bioinformatics analysis reports")
     (description
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 8d4a7e4..90baccd 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -55,10 +55,6 @@
                      (string-append ".:" (getenv "PYTHONPATH")))
              (zero? (system* "python" "tests/runtests.py")))))))
     ;; 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
      `(("tzdata", tzdata)
        ;; bcrypt and argon2-cffi are extra requirements not yet in guix
@@ -113,8 +109,6 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
     (build-system python-build-system)
     (propagated-inputs
      `(("python-django" ,python-django)))
-    (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
     (home-page "https://github.com/alsoicode/django-simple-math-captcha";)
     (synopsis "Easy-to-use math field/widget captcha for Django forms")
     (description
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 0760001..3cfdb7e 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -42,7 +42,6 @@
     (arguments '(#:tests? #f))
     (inputs
      `(("python-requests" ,python-requests)
-       ("python-setuptools" ,python-setuptools)
        ("python-six" ,python-six)
        ("python-websocket-client" ,python-websocket-client)))
     (home-page "https://github.com/docker/docker-py/";)
@@ -93,7 +92,6 @@ client.")
        ("python-jsonschema" ,python-jsonschema)
        ("python-pyyaml" ,python-pyyaml)
        ("python-requests" ,python-requests-2.7)
-       ("python-setuptools" ,python-setuptools)
        ("python-six" ,python-six)
        ("python-texttable" ,python-texttable)
        ("python-websocket-client" ,python-websocket-client)))
diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 5e6cf0b..65f7d87 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -584,8 +584,6 @@ interface (API).")
                         (string-append v4l-ref "/include/libv4l1-videodev.h")
                         "linux/videodev.h")
                (system* "ln" "--symbolic" "Setup.in" "Setup")))))))
-    (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
     (inputs
      `(("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
diff --git a/gnu/packages/key-mon.scm b/gnu/packages/key-mon.scm
index c76360c..6237a17 100644
--- a/gnu/packages/key-mon.scm
+++ b/gnu/packages/key-mon.scm
@@ -42,8 +42,6 @@
     (arguments
      `(#:python ,python-2                    ;uses the Python 2 'print' syntax
        #:tests? #f))                         ;no tests
-    (native-inputs
-     `(("python2-setuptools" ,python2-setuptools)))
     (inputs
      `(("python2-xlib" ,python2-xlib)
        ("python2-pygtk" ,python2-pygtk)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index baa5a96..549340f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1258,8 +1258,6 @@ maintained.")
               (let* ((out (assoc-ref outputs "out"))
                      (doc (string-append out "/share/doc/khard")))
                 (copy-recursively "misc/khard" doc)))))))
-    (native-inputs
-     `(("python2-setuptools" ,python2-setuptools)))
     (propagated-inputs
      `(("python2-vobject" ,python2-vobject)
        ("python2-pyyaml" ,python2-pyyaml)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4539339..3429d99 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1795,7 +1795,6 @@ websites such as Libre.fm.")
     (native-inputs
      `(("python2-beautifulsoup4" ,python2-beautifulsoup4)
        ("python2-flask" ,python2-flask)
-       ("python2-setuptools" ,python2-setuptools)
        ("python2-mock" ,python2-mock)
        ("python2-mpd2" ,python2-mpd2)
        ("python2-nose" ,python2-nose)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 62f1e84..9cbce7b 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -51,7 +51,6 @@
         ("python-stevedore" ,python-stevedore)))
     (inputs
       `(("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests
         ("python-fixtures" ,python-fixtures)
         ("python-mock" ,python-mock)
@@ -88,7 +87,6 @@ all the files it generates a report.")
     (inputs
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests.
         ("python-oslotest" ,python-oslotest)))
     (home-page "http://www.openstack.org/";)
@@ -152,7 +150,6 @@ guidelines}.")
     (native-inputs
       `(("python-fixtures" ,python-fixtures)
         ("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ("python-six" ,python-six)
         ("python-testtools" ,python-testtools)))
     (home-page "http://www.openstack.org/";)
@@ -188,7 +185,6 @@ tested on Python version 3.2, 2.7 and 2.6.")
         ("python-pbr" ,python-pbr)
         ("python-pyyaml" ,python-pyyaml)
         ("python-testrepository" ,python-testrepository)
-        ("python-setuptools" ,python-setuptools)
         ("python-testscenarios" ,python-testscenarios)
         ("python-testtools" ,python-testtools)))
     (home-page "http://www.openstack.org/";)
@@ -383,7 +379,6 @@ common features used in Tempest.")
         ("python-stevedore" ,python-stevedore)))
     (inputs
       `(("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests
         ("python-oslo.i18n" ,python-oslo.i18n)
         ("python-mock" ,python-mock)
@@ -414,7 +409,6 @@ common features used in Tempest.")
     (inputs
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests.
         ("python-oslotest" ,python-oslotest)))
     (home-page "http://launchpad.net/oslo";)
@@ -445,7 +439,6 @@ pipeline and used by various modules such as logging.")
         ("python-six" ,python-six)))
     (inputs
       `(("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests
         ("python-mock" ,python-mock)
         ("python-mox3" ,python-mox3)
@@ -525,7 +518,6 @@ handlers and support for context specific logging (like 
resource id’s etc).")
     (inputs
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests.
         ("python-mock" ,python-mock)
         ("python-oslo.i18n" ,python-oslo.i18n)
@@ -558,7 +550,6 @@ in transmittable and storable formats, such as JSON and 
MessagePack.")
       `(("python-pbr" ,python-pbr)
         ("python-docutils" ,python-docutils)
         ("python-hacking" ,python-hacking)
-        ("python-setuptools" ,python-setuptools)
         ("python-sphinx" ,python-sphinx)))
     (home-page "http://www.openstack.org/";)
     (synopsis "OpenStack sphinx extensions and theme")
@@ -593,7 +584,6 @@ from the OpenStack project.")
     (inputs
       `(("python-pbr" ,python-pbr)
         ("python-os-client-config" ,python-os-client-config)
-        ("python-setuptools" ,python-setuptools)
         ("python-subunit" ,python-subunit)
         ("python-testrepository" ,python-testrepository)
         ("python-testscenarios" ,python-testscenarios)
@@ -637,7 +627,6 @@ and better support for mocking results.")
     (inputs
       `(("python-babel" ,python-babel)
         ("python-pbr" ,python-pbr)
-        ("python-setuptools" ,python-setuptools)
         ;; Tests.
         ("python-oslotest" ,python-oslotest)
         ("python-mock" ,python-mock)
@@ -743,7 +732,6 @@ LDAP.")
     (build-system python-build-system)
     (native-inputs
      `(("python-pbr" ,python-pbr)
-       ("python-setuptools" ,python-setuptools)
        ("python-sphinx" ,python-sphinx)
        ;; The folloing packages are needed for the tests.
        ("python-coverage" ,python-coverage)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index b98e479..e6febf4 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -501,7 +501,6 @@ security, and applying best practice development 
processes.")
        ("python-sphinx" ,python-sphinx)
        ("python-sphinxcontrib-programoutput" 
,python-sphinxcontrib-programoutput)
        ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
-       ("python-setuptools" ,python-setuptools)
        ("texinfo" ,texinfo)))
     (propagated-inputs
      `(("python-ndg-httpsclient" ,python-ndg-httpsclient)

Reply via email to