From patchwork Mon Apr 25 03:56:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38883 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 5223727BBEA; Mon, 25 Apr 2022 05:26:29 +0100 (BST) 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, 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 2340127BBE9 for ; Mon, 25 Apr 2022 05:26:29 +0100 (BST) Received: from localhost ([::1]:52804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niqIu-00078D-9Y for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:26:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipvW-000804-BL for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:23 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipvV-0001mc-9R for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipvV-0008EA-6a for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 070/232] gnu: python-pytest-shutil: Adjust to use python-path. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:02:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55104@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55104-submit@debbugs.gnu.org id=B55104.165085931831307 (code B ref 55104); Mon, 25 Apr 2022 04:02:17 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:01:58 +0000 Received: from localhost ([127.0.0.1]:60858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipvB-00088m-Qf for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:01:58 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:46888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1niptu-0007rb-9c for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:38 -0400 Received: by mail-qk1-f169.google.com with SMTP id c1so9945995qkf.13 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UA1OSt1jrzfKbkLrU4us1Hcpe0M83R5B6JM41Fqgs+w=; b=bi65K3PZyQh0CqiJOy4+e1wL2L1fmwd7KDgrHzRuD0TWuPAw5kZeAIhh8X06KrJAFp C54sHWOhhBqD6P57cAjyzg45BKo0HDday5k3A1dhBDjCelSe7UxUb0kj7ekdv0tWaJmW j8LvoYLaTsOtHN9Tncy4gKBzPPz2jBXFcxfyYffftGtXKQQB61GE4xzU+XmhMh40NUHk fbWd8GsDd5zeeryWE2H64W5F01H9bYWVRuzAk9ALcO2zcugjkDSG9fF0Klmx6dlLhxb7 AsqnA39LskpZfnZceXXI6oDx91FKl1Hg4x3QvjabNK6vWPj397/40NhDCu/4XdKoJPWq 3smg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UA1OSt1jrzfKbkLrU4us1Hcpe0M83R5B6JM41Fqgs+w=; b=x0YyPzzqByLUfLXKZmKMK7FKjPbD5EhYavB27AdW0nSIQXAsiBHqHwZ5aWgukrPlRa 5aVLxLAlMkiB/YO1rFUhnCxAbuQYBcJuvXS/3GkcM72nvWZKtp452PbwTa/fzpWNo3nQ KkeVZGcC4hah8AtpW+S/enzbnCG4xPqEuudDi9WNCN01Kemw55OXAbSFKxQCWMoWdw5j yqKAQ7XYu27yoR7kN/VFDaAA+VzYJkHkmXeoHpeYqch2qss/oZW7ShWpKiaAofjrmBHh u4RxfpmJATPnKC2WsqdE2Tq9wx4R5Jn6dMTQCOK2oU+bgiPZihvQ+ZClfdqLUVIIJqgG CvZw== X-Gm-Message-State: AOAM533eMGllZGyX0Sbgc8/+OisUCHRIqXeHJ/FEjx2qJTNa4yiAJqNe spzU431tEnHEzTlPC5kMVI3Bhuz2a6hphQ== X-Google-Smtp-Source: ABdhPJyKj/dt4oWhPfDdXtlHHLLcMXKXGjGmnf/gF8bfMDQOK1QHY9yc3n9TNnG7ZUfVyIITiGvZHQ== X-Received: by 2002:a37:5e44:0:b0:69e:9f75:cba3 with SMTP id s65-20020a375e44000000b0069e9f75cba3mr8761625qkb.519.1650859232717; Sun, 24 Apr 2022 21:00:32 -0700 (PDT) Received: from localhost.localdomain (dsl-150-232.b2b2c.ca. [66.158.150.232]) by smtp.gmail.com with ESMTPSA id w82-20020a376255000000b0069ee3f0ae63sm4478142qkb.45.2022.04.24.21.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:32 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:56:36 -0400 Message-Id: <20220425035918.25683-70-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220425035918.25683-1-maxim.cournoyer@gmail.com> References: <20220425035918.25683-1-maxim.cournoyer@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-check.scm (python-pytest-shutil) [phases]{use-path-instead-of-path.py}: New phase. [propagated-inputs]: Replace python-path.py with python-path. --- gnu/packages/python-check.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 564d41c323..6966d96c64 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1079,6 +1079,12 @@ (define-public python-pytest-shutil (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'use-path-instead-of-path.py + ;; path.py is obsolete. + (lambda _ + (substitute* "setup.py" + (("'path.py'") + "'path'")))) (add-after 'unpack 'patch-tests (lambda _ (mkdir "/tmp/bin") @@ -1086,11 +1092,9 @@ (define-public python-pytest-shutil (("dirname = '/bin'") "dirname = '/tmp/bin'") (("bindir = os.path.realpath\\('/bin'\\)") - "bindir = os.path.realpath('/tmp/bin')")) - #t))))) + "bindir = os.path.realpath('/tmp/bin')"))))))) (propagated-inputs - (list python-contextlib2 python-execnet python-pathpy - python-termcolor)) + (list python-contextlib2 python-execnet python-path python-termcolor)) (native-inputs (list python-mock python-pytest python-setuptools-git)) (home-page "https://github.com/manahl/pytest-plugins")