From patchwork Mon Apr 25 03:56:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38882 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 993E927BBEA; Mon, 25 Apr 2022 05:26:11 +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 16C7D27BBE9 for ; Mon, 25 Apr 2022 05:26:11 +0100 (BST) Received: from localhost ([::1]:52018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niqIc-0006c6-4P for patchwork@mira.cbaines.net; Mon, 25 Apr 2022 00:26:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipvh-00081i-Th for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:31 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipvg-0001p7-Fm for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipvg-0008Hr-DD for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:28 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 093/232] gnu: python-black: Update to 22.3.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:02:28 +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.165085934531789 (code B ref 55104); Mon, 25 Apr 2022 04:02:28 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:02:25 +0000 Received: from localhost ([127.0.0.1]:60944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipvc-0008GT-EP for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:02:24 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:36740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipuB-0007uT-Pa for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:57 -0400 Received: by mail-qt1-f176.google.com with SMTP id bb21so9571760qtb.3 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:00:55 -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=G7rbxJH5fEv3feoSB6L+Vkl1h/XTM0bulPcQDhoNEsk=; b=NmbCtkNld7+FtvKhuDF3xvFeqgrgMIIuGPC96vMCveqZieehFrI3CBobyx6vLzA+R7 2n+3Lc6rikY4ozcsmBr/Lon9CWz7KWLqDQ855c4Z/5m+lJJP2tAPce13Yqrmd3wjkpae 5Av7GY2+wOmlIpkSpFTgedDTeugBxjzEzwAaolVV8E13Or7ZNmyEYuHfeKJOccnr4HCg RVbZxRdP1TURfdcjIGkM4vxskHjwKKaDXazxwOY6JxkmYFBop44CCyP5eT4tekzLp/W7 2VKp3q+uyogUH8oaSTf5I1BelHnqXRDMaqRSznoom/hvA+cFbfmrJoUGpNahYF+R6yKF rFuQ== 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=G7rbxJH5fEv3feoSB6L+Vkl1h/XTM0bulPcQDhoNEsk=; b=eNXmRxn0U6TtIsBwfzDOFc14yYwvN6fJuxYAhbbd1x+VggCdG3Z9H0Mq2iqNRXtikT XZnu1qpF3mv1DNv8HSbvGT3vEVJtFSR+smqUjuWpDv+GygxG+JSbRaP7GEbaISY75ayb yBM6Tr2QXevuqEkzXiXg641jWIR2HZaLKm+ySc36CI5n2uE8cHusiTYMOZYaMa1SVhq2 LxF0ovjrMFsIrqY7KFxRknA5ZGLUHrNtRlQLCkSKn5u8+kOC7uzj7SxllqaHXaEs0CAq MIgZ4O5ZRrhcnswSC4FSzfHO7LdqZfGfZ2dSzsO/xOZ1+RmyrfLrgjldoew4yWU4MIxm jCkg== X-Gm-Message-State: AOAM530nr4sG2QaSyHt8Vs3TyFxHK8zJFIzd9bSUgaz1c/90Sai/3ZtP 8lG1NbA24u5QylIe8ZtrLU/2INivZgzEQg== X-Google-Smtp-Source: ABdhPJznAqMEzcapqSmcttXonDm8+bZW3sqHHXJkj6Ah2kawUNVjcAQwV54nRsrrAsqN0GQR0dHQ/Q== X-Received: by 2002:a05:622a:1a27:b0:2f3:6417:f20e with SMTP id f39-20020a05622a1a2700b002f36417f20emr4646521qtb.5.1650859250225; Sun, 24 Apr 2022 21:00:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:49 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:56:59 -0400 Message-Id: <20220425035918.25683-93-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-xyz.scm (python-black): Update to 22.3.0. [phases]{relax-version-requirements}: Delete phase. {use-absolute-file-names}: Streamline phase. {disable-broken-tests, remove-entrypoint}: Delete phases. --- gnu/packages/python-xyz.scm | 39 ++++--------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a6e9f64ff3..96a04009bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5415,58 +5415,27 @@ (define-public python-pathspec (define-public python-black (package (name "python-black") - (version "21.12b0") + (version "22.3.0") (source (origin (method url-fetch) (uri (pypi-uri "black" version)) (sha256 (base32 - "1czjwr1bx9ax5l64xfi54sxb1ycdy4s9ciaqg592x7jn79lhzf3p")))) + "0yfahlqc7dsdp1js0cbv706apldnfnlbal9b53cww8n0hs40n0im")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; XXX Remove this when updating this package: - ;; https://github.com/psf/black/issues/2703#issuecomment-1004752142 - (add-after 'unpack 'relax-version-requirements - (lambda _ - (substitute* "setup.py" - (("tomli[^\"]*\",") - "tomli\",")))) (add-after 'patch-source-shebangs 'use-absolute-file-names (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((inpts (or native-inputs inputs)) - (python3 (search-input-file inpts "/bin/python3")) - (/bin/false (search-input-file inpts "/bin/false")) - (/bin/sleep (search-input-file inpts "/bin/sleep"))) + (python3 (search-input-file inpts "/bin/python3"))) (substitute* (find-files "tests" "\\.py$") (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version) (string-append "#!" python3 (if (string? minor-version) minor-version - "")))) - (substitute* "tests/test_primer.py" - (("/bin/false") /bin/false) - (("/bin/sleep") /bin/sleep))))) - (add-after 'unpack 'disable-broken-tests - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Make installed package available for running the tests - (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" - ":" (getenv "PATH"))) - - ;; The source formatting test fails because we patch various - ;; files; just disable it. - (substitute* "tests/test_format.py" - (("def test_source_is_formatted" all) - (format #f "@pytest.mark.skip(\"Disabled by Guix.\")\n~a" - all))))) - ;; Remove blackd, because it depends on python-aiohttp and - ;; python-aiohttp-cors. - (add-after 'unpack 'remove-entrypoint - (lambda _ - (substitute* "setup.py" - (("\\s*\"blackd=blackd:patched_main \\[d\\]\",\n") "") - (("\"blackd\", ") "")))) + ""))))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "pytest" "-vv")))))))