From patchwork Mon Jun 6 17:24:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Rodriguez X-Patchwork-Id: 39759 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 081AB27BBEA; Mon, 6 Jun 2022 18:25:19 +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 8101027BBE9 for ; Mon, 6 Jun 2022 18:25:18 +0100 (BST) Received: from localhost ([::1]:50532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyGTd-0007bU-MS for patchwork@mira.cbaines.net; Mon, 06 Jun 2022 13:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyGTQ-0007bD-Q0 for guix-patches@gnu.org; Mon, 06 Jun 2022 13:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyGTO-0003NZ-LO for guix-patches@gnu.org; Mon, 06 Jun 2022 13:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nyGTO-0004wK-5T for guix-patches@gnu.org; Mon, 06 Jun 2022 13:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55814] [PATCH v2] Updated python-flake8 and inputs to reenable build. References: <20220606014315.280227-1-yewscion@gmail.com> In-Reply-To: <20220606014315.280227-1-yewscion@gmail.com> Resent-From: Christopher Rodriguez Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jun 2022 17:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55814@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 55814-submit@debbugs.gnu.org id=B55814.165453628618964 (code B ref 55814); Mon, 06 Jun 2022 17:25:02 +0000 Received: (at 55814) by debbugs.gnu.org; 6 Jun 2022 17:24:46 +0000 Received: from localhost ([127.0.0.1]:36704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nyGT8-0004vo-4Y for submit@debbugs.gnu.org; Mon, 06 Jun 2022 13:24:46 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:45769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nyGT6-0004vZ-3L for 55814@debbugs.gnu.org; Mon, 06 Jun 2022 13:24:44 -0400 Received: by mail-qt1-f175.google.com with SMTP id x16so7566271qtw.12 for <55814@debbugs.gnu.org>; Mon, 06 Jun 2022 10:24:44 -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:mime-version :content-transfer-encoding; bh=NzLhN61jh+AhyzcB/cRSgYnyIPYSzGSZsmgOqkqAwNc=; b=ocHiIpYMLbFBASm0dMbG7W8tOxry0NP7+eFnaogYyhUBM2/zp/D9Tf2qOGLmzQEEjl HnWckfoa7/+tG3KAqXFyeHgfhPH497WGKDvY6uDwB2LtfXCYwqSi9Y0X0dFch0Kf5q6a 5TO1DmG8j5h6fNatgViS7mPbKTa48LM//qGEqVmfnlrsa9V+/d8utytcsFO9z8y3HOL9 v9OS2IyBXfHpZnJP7dVx8HtvsbMN83TpN72SuyscUyMmM1hq7aqbo069DYmcouKK0jay YwYW7BpOBL1CcAsM0tC/mowR2Pl40R9pm+IdCPRIaJ94W89NYlzmzMllPQqDAd2eH8b3 mqkw== 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:mime-version :content-transfer-encoding; bh=NzLhN61jh+AhyzcB/cRSgYnyIPYSzGSZsmgOqkqAwNc=; b=8HkOK2nuCkFdljBjC9s/wveC89lTyi3BdDuLnCiD3+s+YUZor3gJSkRNjYNSCc62nY mHHiXdfbynB0r2KbTF8chWbNg9z5lIXEF+eOrlH0L24AmSmpRsO3GNi33foV+yz+8t7x DPBUSJY5u2+lnSIaewHWsXFXNbms5cotnyUaul6LAaE+UOdTnZk7DXB1hyuRklTXBctl zlghJ+zsj6IdKV8hjgp1crWuYOZ2mRS7LqHODlAcTqkTLnveEXfjvSAB39n0mSaBmIQA GI9VzzRawdOZr6eZ2mtHq5Hm3QPDLnpu5T1GuhZ447NdXAB3GmY3gFuhK8m0I2JlQXAL YRUA== X-Gm-Message-State: AOAM530LditXtiSJjNYeyGpIpd6qazTfb1MfbpnH/cPM8uzNUZv+aLeg H4H+BSk7199VJIFRqPFtlVDpb/acU7o= X-Google-Smtp-Source: ABdhPJxguL6whDSB51U1g8Cpow4b1qRdXQTERxxIBriwAYxBdzu5mnyPOQTXcKPRTAYGKTPqGjUGDw== X-Received: by 2002:a05:622a:40a:b0:304:c4ad:601 with SMTP id n10-20020a05622a040a00b00304c4ad0601mr19005721qtx.302.1654536277842; Mon, 06 Jun 2022 10:24:37 -0700 (PDT) Received: from gmail.com ([52.94.133.128]) by smtp.gmail.com with ESMTPSA id bk25-20020a05620a1a1900b006a673ac7891sm10563415qkb.91.2022.06.06.10.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 10:24:37 -0700 (PDT) From: Christopher Rodriguez Date: Mon, 6 Jun 2022 13:24:32 -0400 Message-Id: <20220606172432.363385-1-yewscion@gmail.com> X-Mailer: git-send-email 2.36.1 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 --- Maxime, Thanks for the feedback! Sorry for missing something so basic. I swapped both of the `if` statements with `when` statements, as they are more semantically appropriate here anyway. I also fixed a mistake I found in the lambda call (#:keys instead of #:key), and uploaded the current version of `python-flake8` (4.0.1) to the software heritage project. I'm waiting for the save to go through, but after that, the linter will return no errors. gnu/packages/python-xyz.scm | 54 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 28 deletions(-) base-commit: 41cf573f0a4fefb0539174b46cfe65e9db128870 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0dfc6ca7e0..ffb7001c03 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6443,23 +6443,21 @@ (define-public python-socksipychain (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.7.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pycodestyle" version)) - (sha256 - (base32 - "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3")))) + (version "2.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pycodestyle" version)) + (sha256 + (base32 + "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) - (native-inputs - (list python-pytest)) + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key input output tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") (description "@code{pycodestyle} (formerly pep8) is a tool to check @@ -10143,18 +10141,17 @@ (define-public python-pyflakes (package (name "python-pyflakes") (version "2.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyflakes" version)) - (sha256 - (base32 - "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "pyflakes" version)) + (sha256 + (base32 + "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05")))) (build-system python-build-system) (home-page "https://github.com/PyCQA/pyflakes") (synopsis "Passive checker of Python programs") (description - "Pyflakes statically checks Python source code for common errors.") + "Pyflakes statically checks Python source code for common errors.") (license license:expat))) (define-public python-pyflakes-2.2 @@ -10193,20 +10190,21 @@ (define-public python-mccabe (define-public python-flake8 (package (name "python-flake8") - (version "3.9.2") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")))) + "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v")))))) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v"))))))) (propagated-inputs (list python-pycodestyle python-entrypoints python-pyflakes python-mccabe)) (native-inputs (list python-mock python-pytest))