diff mbox series

[bug#40543,3/4] gnu: python2-dogtail: Switch to Python 3, and add Python 2 variant.

Message ID 20200410162157.21065-3-mail@cbaines.net
State Accepted
Headers show
Series Work towards enabling virt-manager tests | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/applying patch fail View Laminar job

Commit Message

Christopher Baines April 10, 2020, 4:21 p.m. UTC 
* 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.
---
 gnu/packages/python-xyz.scm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 455bebf1b7..dac43eeea8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1735,11 +1735,9 @@  Python 3.3+.")
                (delete-file "test/test_Script.py")
                #t))))))))
 
-(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)
@@ -1752,8 +1750,7 @@  Python 3.3+.")
                "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
@@ -1765,11 +1762,11 @@  Python 3.3+.")
                (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)
@@ -1784,6 +1781,9 @@  applications. dogtail scripts are written in Python and executed like any
 other Python program.")
     (license license:gpl2+)))
 
+(define-public python2-dogtail
+  (package-with-python2 python-dogtail))
+
 (define-public python-empy
   (package
     (name "python-empy")