From patchwork Fri Dec 17 17:56:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 35369 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 4DE5D27BBEA; Sat, 18 Dec 2021 10:10:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1AA8327BBE9 for ; Sat, 18 Dec 2021 10:10:32 +0000 (GMT) Received: from localhost ([::1]:36968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myWff-0000xz-4F for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 05:10:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myWfD-0000v3-3D for guix-patches@gnu.org; Sat, 18 Dec 2021 05:10:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myWfC-0005Mb-Pa for guix-patches@gnu.org; Sat, 18 Dec 2021 05:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myWfC-0004B5-Jc for guix-patches@gnu.org; Sat, 18 Dec 2021 05:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52595] [PATCH 1/5] gnu: python-future: Fix sanity check. References: <9af1bb4930763c511306573bbf032d6ed700ff25.camel@gmail.com> In-Reply-To: <9af1bb4930763c511306573bbf032d6ed700ff25.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52595 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52595@debbugs.gnu.org Received: via spool by 52595-submit@debbugs.gnu.org id=B52595.163982214615960 (code B ref 52595); Sat, 18 Dec 2021 10:10:02 +0000 Received: (at 52595) by debbugs.gnu.org; 18 Dec 2021 10:09:06 +0000 Received: from localhost ([127.0.0.1]:41289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myWeH-00049G-R5 for submit@debbugs.gnu.org; Sat, 18 Dec 2021 05:09:06 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myWeF-00048M-B6 for 52595@debbugs.gnu.org; Sat, 18 Dec 2021 05:09:04 -0500 Received: by mail-wr1-f66.google.com with SMTP id i22so8690144wrb.13 for <52595@debbugs.gnu.org>; Sat, 18 Dec 2021 02:09:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=TybvxtzEe2FFfoV1Q+jglUXJv3EFH1DUxesB9rFiiSM=; b=LhzypMIIqwDUW+YWbBlrRqQh25Lhg1cu1OBV7Q6GGASHvMKW2hqZozeLNkqGzCaJp5 ypVSvWxH6XWaHeeApoNsEKawtpJbohT15a65UmEThy0G8CRNlyGdPDUl7xl/a6LKuryo NxpECYmUCe6OJJC+2u3VtwBhfTBhA+eWl6YWR3YSRLHiRBs9zqmPcCRLQFGi/OtNfpFv A1ua0dmVeaWGxuORiioxV8gx7fbh9LTFdV0JfkKZIBnKuDLHj50MMUgWKRXP9y2997G9 Cqt4R5KJD5RT3jq7HFoNKGjon0Yw2pxnwyO5JSC5aeo8aM+A8Tap1y8iDrj/Vo+Les6X HMzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=TybvxtzEe2FFfoV1Q+jglUXJv3EFH1DUxesB9rFiiSM=; b=oALw0afl+YNrBn59WXrNCMjSm5+6a+0eCMKwrqivpbWTgGV7e38S2UmpXN/AVhvaH4 puPGqyZVYjhCysEsiPdnE4QRnJXk0VO72d6h1HIueG7+HBFTP1XbMzwVSaB9uxCWvM4w umGsZGE/mVXU6udUguJL/UCR2H9uWYiayaXu+5WbdqECHkz3GFHRA8w1G2N+SEF4Nh6n v1H3W6n4oT6okzB2nQnBh3SuKVp2+4yf4vuil5ycJbqb9VI/9Lo/nNkvCR0F4qJVN5al 74iJ6vNYcw2Rbe4fANHD8P3ZKdWORS9cdfQMcHIdbaPeKWtqVq/HLXRKiHW9ltD9sLzt a7aA== X-Gm-Message-State: AOAM531U3AYVWQXGsPzKWCj3PNd8lEFroMKbIxI9R7ViTWeMipix9seu AW+rhXcr0XMH/NpBzVnImHSPh7sxc/kYSg== X-Google-Smtp-Source: ABdhPJx+pZhKsDr3NHDG8oPISfVIvsgqo44pxpiDOZWoPVyJqxhtnKUDA6GPGkLMGN+uJZkJUKChBQ== X-Received: by 2002:a5d:584f:: with SMTP id i15mr1227397wrf.542.1639822137486; Sat, 18 Dec 2021 02:08:57 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r8sm12119060wrz.43.2021.12.18.02.08.56 for <52595@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 02:08:57 -0800 (PST) From: Liliana Marie Prikler Date: Fri, 17 Dec 2021 18:56:56 +0100 Message-ID: <6f948e621fa47df5e1e138923b334096e29d4fdf.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 (python-future): Exclude winreg and tkinter from sanity check. --- gnu/packages/python-xyz.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 13d883c26d..3970153894 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14780,7 +14780,24 @@ (define-public python-future ;; Many tests connect to the network or are otherwise flawed. ;; https://github.com/PythonCharmers/python-future/issues/210 (arguments - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'sanity-check + (let ((sanity-check (assoc-ref %standard-phases 'sanity-check))) + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((files (find-files (site-packages inputs outputs) + "top_level\\.txt")) + (backups (map (lambda (f) (string-append f ".bak")) + files))) + (for-each copy-file files backups) + (substitute* files + ;; Nobody be usin' winreg on Guix + ;; Also, don't force users to have tkinter when they don't + ;; need it + (("(winreg|tkinter)") "")) + (apply sanity-check args) + (for-each rename-file backups files)))))))) (home-page "https://python-future.org") (synopsis "Single-source support for Python 3 and 2") (description