htgoebel pushed a commit to branch wip-python-build-system in repository guix.
commit 3348d331907a0f91f5836016afc54ea733bd5c12 Author: Hartmut Goebel <h.goe...@crazy-compilers.com> Date: Thu Oct 13 13:35:55 2016 +0200 gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs. This patch contains the changes where all [inputs] are changed to [native-inputs]. * gnu/packages/python.scm (python-pytest, python-fixtures, python-testrepository, python-virtualenv): All [inputs] are changed to [native-inputs]. * gnu/packages/openstack.scm (...): dito. --- gnu/packages/openstack.scm | 24 ++++++++++++------------ gnu/packages/python.scm | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 172de25..96ad32e 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -49,7 +49,7 @@ ("python-pyyaml" ,python-pyyaml) ("python-six" ,python-six) ("python-stevedore" ,python-stevedore))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-fixtures" ,python-fixtures) @@ -84,7 +84,7 @@ all the files it generates a report.") (propagated-inputs `(("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -120,7 +120,7 @@ manner.") ("python-pep8-1.5.7" ,python-pep8-1.5.7) ("python-pyflakes-0.8.1" ,python-pyflakes-0.8.1) ("python-six" ,python-six))) - (inputs + (native-inputs `(;; Tests ("python-testscenarios" ,python-testscenarios))) (home-page "http://github.com/openstack-dev/hacking") @@ -332,7 +332,7 @@ extensions.") ("python-paramiko" ,python-paramiko) ("python-pbr" ,python-pbr) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-mock" ,python-mock) ("python-os-testr" ,python-os-testr) @@ -367,7 +367,7 @@ common features used in Tempest.") `(("python-netaddr" ,python-netaddr) ("python-six" ,python-six) ("python-stevedore" ,python-stevedore))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-oslo.i18n" ,python-oslo.i18n) @@ -396,7 +396,7 @@ common features used in Tempest.") (base32 "0kvha0rs9295njyl2z6n6zm5dapi5mrl5zwjm0m6ldqrvccyf8c3")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -427,7 +427,7 @@ pipeline and used by various modules such as logging.") (propagated-inputs `(("python-babel" ,python-babel) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ;; Tests ("python-mock" ,python-mock) @@ -468,7 +468,7 @@ in an application or library.") ("python-oslo.utils" ,python-oslo.utils) ("python-oslo.serialization" ,python-oslo.serialization) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-iso8601" ,python-iso8601) ("python-mock" ,python-mock) @@ -504,7 +504,7 @@ handlers and support for context specific logging (like resource id’s etc).") ("python-simplejson" ,python-simplejson) ("python-six" ,python-six) ("python-pytz" ,python-pytz))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. @@ -535,7 +535,7 @@ in transmittable and storable formats, such as JSON and MessagePack.") (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ("python-docutils" ,python-docutils) ("python-hacking" ,python-hacking) @@ -570,7 +570,7 @@ from the OpenStack project.") ("python-mock" ,python-mock) ("python-mox3" ,python-mox3) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-pbr" ,python-pbr) ("python-os-client-config" ,python-os-client-config) ("python-subunit" ,python-subunit) @@ -613,7 +613,7 @@ and better support for mocking results.") ("python-netifaces" ,python-netifaces) ("python-pytz" ,python-pytz) ("python-six" ,python-six))) - (inputs + (native-inputs `(("python-babel" ,python-babel) ("python-pbr" ,python-pbr) ;; Tests. diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 445dbfd..ff9ef42 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1563,7 +1563,7 @@ code introspection, and logging.") (build-system python-build-system) (propagated-inputs `(("python-py" ,python-py))) - (inputs + (native-inputs `(("python-nose" ,python-nose) ("python-mock" ,python-mock))) (home-page "http://pytest.org") @@ -1981,7 +1981,7 @@ and sensible default behaviors into your setuptools run.") (propagated-inputs `(("python-six" ,python-six) ("python-pbr-0.11" ,python-pbr-0.11))) - (inputs + (native-inputs `(;; Tests ("python-testtools" ,python-testtools))) (arguments @@ -2013,7 +2013,7 @@ Python tests.") (propagated-inputs `(("python-fixtures-0.3.16" ,python-fixtures-0.3.16) ("python-testtools" ,python-testtools))) - (inputs + (native-inputs `(("python-subunit" ,python-subunit) ("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") @@ -2511,7 +2511,7 @@ object.") (substitute* "tests/test_virtualenv.py" (("skipif.*") "skipif(True, reason=\"Guix\")\n")) (zero? (system* "py.test"))))))) - (inputs + (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest))) (home-page "https://virtualenv.pypa.io/")