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.
This commit is contained in:
Efraim Flashner 2016-04-10 22:07:28 +03:00
parent 54cd239b35
commit fbe9abcce4
1 changed files with 11 additions and 5 deletions

View File

@ -1649,10 +1649,10 @@ supports coverage of subprocesses.")
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("unzip" ,unzip) `(("unzip" ,unzip)
("python-setuptools" ,python-setuptools)
("python-setuptools-scm" ,python-setuptools-scm))) ("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs (inputs
`(("python-execnet" ,python-execnet) `(("python-apipkg" ,python-apipkg)
("python-execnet" ,python-execnet)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-py" ,python-py))) ("python-py" ,python-py)))
(home-page (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 Python interpreters or platforms. It uses rsync to copy the existing
program code to a remote location, executes there, and then syncs the program code to a remote location, executes there, and then syncs the
result back.") result back.")
(license license:expat))) (license license:expat)
(properties `((python2-variant . ,(delay python2-pytest-xdist))))))
(define-public 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 (define-public python-scripttest
(package (package