diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2016-04-10 22:07:28 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2016-04-10 22:07:45 +0300 |
commit | fbe9abcce40d9f07035f96a3f81b120c7325591a (patch) | |
tree | 159431b731fd0981d9d0bf9beb7d7afa09e789b4 /gnu/packages/python.scm | |
parent | 54cd239b358f7d3fb15a0d17a96713c68c5142ec (diff) | |
download | guix-patches-fbe9abcce40d9f07035f96a3f81b120c7325591a.tar guix-patches-fbe9abcce40d9f07035f96a3f81b120c7325591a.tar.gz |
gnu: python-pytest-xdist: Change inputs.
* gnu/packages/python.scm (python-pytest-xdist)[native-inputs]: Remove
python-setuptools.
[propagated-inputs]: Move python-execnet, python-py, python-pytest ...
[inputs]: ... to here. Add python-apipkg.
[properties]: Define python2-pytest-xdist.
(python2-pytest-xdist): Build with 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r-- | gnu/packages/python.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c3daf3156f..9a8676a6b7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1649,10 +1649,10 @@ supports coverage of subprocesses.") (build-system python-build-system) (native-inputs `(("unzip" ,unzip) - ("python-setuptools" ,python-setuptools) ("python-setuptools-scm" ,python-setuptools-scm))) - (propagated-inputs - `(("python-execnet" ,python-execnet) + (inputs + `(("python-apipkg" ,python-apipkg) + ("python-execnet" ,python-execnet) ("python-pytest" ,python-pytest) ("python-py" ,python-py))) (home-page @@ -1666,10 +1666,16 @@ to run tests repeatedly when failed, and the ability to run tests on multiple Python interpreters or platforms. It uses rsync to copy the existing program code to a remote location, executes there, and then syncs the result back.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-pytest-xdist)))))) (define-public python2-pytest-xdist - (package-with-python2 python-pytest-xdist)) + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-xdist)))) + (package + (inherit base) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs base)))))) (define-public python-scripttest (package |