From patchwork Wed Apr 15 17:49:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 21275 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2980E27BBE4; Wed, 15 Apr 2020 18:50:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AAF2827BBE1 for ; Wed, 15 Apr 2020 18:50:23 +0100 (BST) Received: from localhost ([::1]:53338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOmB5-00017q-6I for patchwork@mira.cbaines.net; Wed, 15 Apr 2020 13:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46982) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOmAn-000160-8q for guix-patches@gnu.org; Wed, 15 Apr 2020 13:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOmAm-0005H6-4j for guix-patches@gnu.org; Wed, 15 Apr 2020 13:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53785) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOmAm-0005H2-1r for guix-patches@gnu.org; Wed, 15 Apr 2020 13:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOmAm-0001MF-0E for guix-patches@gnu.org; Wed, 15 Apr 2020 13:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40543] [PATCH v2 4/5] gnu: python2-dogtail: Switch to Python 3, and add Python 2 variant. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Apr 2020 17:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40543 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40543@debbugs.gnu.org Received: via spool by 40543-submit@debbugs.gnu.org id=B40543.15869730025198 (code B ref 40543); Wed, 15 Apr 2020 17:50:03 +0000 Received: (at 40543) by debbugs.gnu.org; 15 Apr 2020 17:50:02 +0000 Received: from localhost ([127.0.0.1]:37092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOmAk-0001LZ-0L for submit@debbugs.gnu.org; Wed, 15 Apr 2020 13:50:02 -0400 Received: from mira.cbaines.net ([212.71.252.8]:55174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOmAe-0001Kc-GY for 40543@debbugs.gnu.org; Wed, 15 Apr 2020 13:49:58 -0400 Received: from localhost (unknown [46.237.160.17]) by mira.cbaines.net (Postfix) with ESMTPSA id B970E27BBEB for <40543@debbugs.gnu.org>; Wed, 15 Apr 2020 18:49:55 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 62435e22 for <40543@debbugs.gnu.org>; Wed, 15 Apr 2020 17:49:52 +0000 (UTC) From: Christopher Baines Date: Wed, 15 Apr 2020 18:49:51 +0100 Message-Id: <20200415174952.9368-4-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415174952.9368-1-mail@cbaines.net> References: <87wo6n726x.fsf@cbaines.net> <20200415174952.9368-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3dccedd6df..768f030051 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1736,11 +1736,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) @@ -1753,8 +1751,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 @@ -1766,11 +1763,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) @@ -1785,6 +1782,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")