gnu: python2-dogtail: Switch to Python 3, and add Python 2 variant.

* gnu/packages/python-xyz.scm (python2-dogtail): Rename to python-dogtail.
[name]: Change python2-dogtail to python-dogtail.
[arguments]: Remove #:python.
[propagated-inputs,native-inputs]: Switch Python 2 packages to Python 3
variants.
(python2-dogtail): New variable.
This commit is contained in:
Christopher Baines 2020-04-10 13:54:25 +01:00
parent cf7381612c
commit c4b0131010
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577

View file

@ -1748,11 +1748,9 @@ (define-public python-pyicu
(define-public python2-pyicu
(package-with-python2 python-pyicu))
(define-public python2-dogtail
;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and
;; spaces in indentation" with Python 3.
(define-public python-dogtail
(package
(name "python2-dogtail")
(name "python-dogtail")
(version "0.9.11")
(source (origin
(method url-fetch)
@ -1765,8 +1763,7 @@ (define-public python2-dogtail
"0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2
#:tests? #f ; TODO Launching dbus for the tests
`(#:tests? #f ; TODO Launching dbus for the tests
; fails
#:phases
(modify-phases %standard-phases
@ -1778,11 +1775,11 @@ (define-public python2-dogtail
(invoke "dbus-run-session" "--" "nosetests" "-v" "tests/"))
#t)))))
(propagated-inputs
`(("python-pygobject" ,python2-pygobject)
("python-pycairo" ,python2-pycairo)
("python-pyatspi" ,python2-pyatspi)))
`(("python-pygobject" ,python-pygobject)
("python-pycairo" ,python-pycairo)
("python-pyatspi" ,python-pyatspi)))
(native-inputs
`(("python-nose" ,python2-nose)
`(("python-nose" ,python-nose)
("gtk+" ,gtk+)
("xvfb" ,xorg-server)
("dbus" ,dbus)
@ -1797,6 +1794,9 @@ (define-public python2-dogtail
other Python program.")
(license license:gpl2+)))
(define-public python2-dogtail
(package-with-python2 python-dogtail))
(define-public python-empy
(package
(name "python-empy")