23/103: gnu: Fix python inputs, part 5: some inputs become propagated-inputs

[Hartmut Goebel]

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

commit 7bbb08f882997032b997e56d6f661cf01969bf2f
Author: Hartmut Goebel <address@hidden>
Date:   Thu Oct 13 14:05:11 2016 +0200

    gnu: Fix python inputs, part 5: some inputs become propagated-inputs
    
    * gnu/packages/openstack.scm
      (python-os-client-config)[inputs] change to
      [native-inputs]. [propagated-inputs]: New element, move python-appdirs,
      python-pyyaml here.
      (python-git-review)[propagated-inputs]: New element, move python-requests
      here.
    * gnu/packages/python.scm
      (python-rpy2)[propagated-inputs]: New element, move python-six here.
      (python-xcffib)[inputs] move python-six to [propagated-inputs].
      (python-flake8)[propagated-inputs]: New element, move python-pep8,
      python-pyflakes, python-mccabe here.
      (python-flake8-2.2.4)[propagated-inputs]: New element, move python-pep8,
      python-pyflakes, python-mccabe here.
      (python-pytest)[propagated-inputs]: New element, move python-py here.
      (python-tox)[propagated-inputs]: New element, move all inputs except of
      python-pytest here.
      (python-botocore)[propagated-inputs]: New element, move python-dateutil,
      python-docutils, python-jmespath here.
      (awscli)[propagated-inputs]: New element, move python-colorama,
      python-botocore, python-s3transfer, python-docutils, python-rsa here.
      (python-mako)[propagated-inputs]: New element, move python-markupsafe 
here.
    * gnu/packages/qemu.scm(python-libvirt)[propagated-inputs]: New element, 
move
      python-lxml here.
---
 gnu/packages/openstack.scm |   12 ++++----
 gnu/packages/python.scm    |   67 +++++++++++++++++++++++++-------------------
 gnu/packages/qemu.scm      |    5 ++--
 3 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 96ad32e..f574094 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -177,12 +177,13 @@ tested on Python version 3.2, 2.7 and 2.6.")
     (build-system python-build-system)
     (arguments
      `(#:tests? #f)) ;; Circular dependency with python-oslotest
-    (inputs
+    (propagated-inputs
       `(("python-appdirs" ,python-appdirs)
+        ("python-pyyaml" ,python-pyyaml)))
+    (native-inputs
+      `(("python-pbr" ,python-pbr)
         ("python-fixtures" ,python-fixtures)
         ("python-mimeparse" ,python-mimeparse)
-        ("python-pbr" ,python-pbr)
-        ("python-pyyaml" ,python-pyyaml)
         ("python-testrepository" ,python-testrepository)
         ("python-testscenarios" ,python-testscenarios)
         ("python-testtools" ,python-testtools)))
@@ -789,9 +790,10 @@ permanence.")
                          (list git openssh))))))))))
     (native-inputs
      `(("python-pbr" ,python-pbr)))
+    (propagated-inputs
+     `(("python-requests" ,python-requests)))
     (inputs
-     `(("python-requests" ,python-requests)
-       ("git" ,git)
+     `(("git" ,git)
        ("openssh" ,openssh)))
     (home-page "http://docs.openstack.org/infra/git-review/";)
     (synopsis "Command-line tool for Gerrit")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9f793c4..881666b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1560,9 +1560,10 @@ code introspection, and logging.")
            (("def test_remove_dir_prefix\\(self\\):")
             "@pytest.mark.xfail\n    def test_remove_dir_prefix(self):")))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-py" ,python-py)))
     (native-inputs
-     `(("python-py" ,python-py)
-       ("python-nose" ,python-nose)
+     `(("python-nose" ,python-nose)
        ("python-mock" ,python-mock)))
     (home-page "http://pytest.org";)
     (synopsis "Python testing library")
@@ -3447,9 +3448,10 @@ operators such as union, intersection, and difference.")
         (base32
          "0nhan2qvrw7b7gg5zddwa22kybdv3x1g26vkd7q8lvnkgzrs4dga"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)))
     (inputs
-     `(("python-six" ,python-six)
-       ("readline" ,readline)
+     `(("readline" ,readline)
        ("icu4c" ,icu4c)
        ("pcre" ,pcre)
        ("r" ,r)))
@@ -3892,10 +3894,10 @@ a front-end for C compilers or analysis tools.")
         "0655hzxv57h1a9ja9kwp0ichbkhf3djw32k33d66xp0q37dq2y81"))))
     (build-system python-build-system)
     (inputs
-     `(("libxcb" ,libxcb)
-       ("python-six" ,python-six)))
+     `(("libxcb" ,libxcb)))
     (propagated-inputs
-     `(("python-cffi" ,python-cffi))) ; used at run time
+     `(("python-cffi" ,python-cffi) ; used at run time
+       ("python-six" ,python-six)))
     (arguments
      `(#:phases
        (alist-cons-after
@@ -5159,11 +5161,12 @@ complexity of Python source code.")
           (base32
             "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"))))
     (build-system python-build-system)
-    (inputs
+    (propagated-inputs
       `(("python-pep8" ,python-pep8)
         ("python-pyflakes" ,python-pyflakes)
-        ("python-mccabe" ,python-mccabe)
-        ("python-mock" ,python-mock)
+        ("python-mccabe" ,python-mccabe)))
+    (inputs
+      `(("python-mock" ,python-mock)
         ("python-nose" ,python-nose)))
     (home-page "https://gitlab.com/pycqa/flake8";)
     (synopsis
@@ -5179,11 +5182,12 @@ complexity of Python source code.")
 ;; necessary once python-hacking > 0.10.2 is released.
 (define-public python-flake8-2.2.4
   (package (inherit python-flake8)
-    (inputs
+    (propagated-inputs
       `(("python-pep8" ,python-pep8-1.5.7)
         ("python-pyflakes" ,python-pyflakes-0.8.1)
-        ("python-mccabe" ,python-mccabe-0.2.1)
-        ("python-mock" ,python-mock)
+        ("python-mccabe" ,python-mccabe-0.2.1)))
+    (inputs
+      `(("python-mock" ,python-mock)
         ("python-nose" ,python-nose)))
     (version "2.2.4")
     (source
@@ -7449,11 +7453,12 @@ Pytest but stripped of Pytest specific details.")
     ;; FIXME: Tests require a newer version of pytest, but upgrading our
     ;; pytest breaks other packages.
     '(#:tests? #f))
-   (inputs
-    `(("python-pluggy" ,python-pluggy)
+   (propagated-inputs
+    `(("python-pluggy" ,python-pluggy) ; >=0.3.0,<0.4.0
       ("python-py" ,python-py)
-      ("python-virtualenv" ,python-virtualenv)
-      ("python-pytest" ,python-pytest)))
+      ("python-virtualenv" ,python-virtualenv)))
+   (inputs
+    `(("python-pytest" ,python-pytest)))
    (home-page "http://tox.testrun.org/";)
    (synopsis "Virtualenv-based automation of test activities")
    (description "Tox is a generic virtualenv management and test command line
@@ -7500,14 +7505,16 @@ document.")
       (base32
        "1zxczlwqy9bl27d9bc5x99mb5mcsxm350240lp5nx7014xb311lj"))))
    (build-system python-build-system)
-   (inputs
+   (propagated-inputs
     `(("python-dateutil" ,python-dateutil-2)
       ("python-docutils" ,python-docutils)
-      ("python-mock" ,python-mock)
+      ("python-jmespath" ,python-jmespath)))
+   (inputs
+    `(("python-mock" ,python-mock)
       ("python-nose" ,python-nose)
+      ("behave" ,behave)
       ("python-tox" ,python-tox)
-      ("python-wheel" ,python-wheel)
-      ("python-jmespath" ,python-jmespath)))
+      ("python-wheel" ,python-wheel)))
    (home-page "https://github.com/boto/botocore";)
    (synopsis "Low-level interface to AWS")
    (description "Botocore is a Python library that provides a low-level
@@ -7529,17 +7536,18 @@ interface to the Amazon Web Services (AWS) API.")
       (base32
        "0lclasm0wnayd3b8zl9l91i32nbgrhh0ncf9lksss4cv0myfwmfg"))))
    (build-system python-build-system)
-   (inputs
+   (propagated-inputs
     `(("python-colorama" ,python-colorama)
+      ("python-botocore" ,python-botocore)
+      ("python-s3transfer" ,python-s3transfer)
       ("python-docutils" ,python-docutils)
-      ("python-mock" ,python-mock)
+      ("python-rsa" ,python-rsa)))
+   (inputs
+    `(("python-mock" ,python-mock)
       ("python-nose" ,python-nose)
-      ("python-rsa" ,python-rsa)
       ("python-sphinx" ,python-sphinx)
       ("python-tox" ,python-tox)
-      ("python-wheel" ,python-wheel)
-      ("python-botocore" ,python-botocore)
-      ("python-s3transfer" ,python-s3transfer)))
+      ("python-wheel" ,python-wheel)))
    (home-page "http://aws.amazon.com/cli/";)
    (synopsis "Command line client for AWS")
    (description "AWS CLI provides a unified command line interface to the
@@ -7665,9 +7673,10 @@ available in Django, but is a standalone package.")
         (base32
          "136kcjbs0s98qkx8a418b05dfblqp0kiiqyx8vhx4rarwc7bqi3n"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-markupsafe" ,python-markupsafe)))
     (native-inputs
-     `(("python-markupsafe" ,python-markupsafe)
-       ("python-mock" ,python-mock)
+     `(("python-mock" ,python-mock)
        ("python-nose" ,python-nose)))
     (home-page "http://www.makotemplates.org/";)
     (synopsis "Templating language for Python")
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 9bf8c3a..1d231ef 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -395,8 +395,9 @@ three libraries:
                                (which "nosetests") "\"")))
              #t)))))
     (inputs
-     `(("libvirt" ,libvirt)
-       ("python-lxml" ,python-lxml)))
+     `(("libvirt" ,libvirt)))
+    (propagated-inputs
+     `(("python-lxml" ,python-lxml)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python-nose" ,python-nose)))