me
/
guix
Archived
1
0
Fork 0
Code

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.
master
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
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/python-xyz.scm
View File

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