From patchwork Sat Mar 11 01:31:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47864 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 1E24E16EA0; Sat, 11 Mar 2023 01:32:31 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A63A316C91 for ; Sat, 11 Mar 2023 01:32:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pao5c-0002kn-DA; Fri, 10 Mar 2023 20:32:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pao5a-0002kH-EE for guix-patches@gnu.org; Fri, 10 Mar 2023 20:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pao5a-0008Au-55 for guix-patches@gnu.org; Fri, 10 Mar 2023 20:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pao5a-00039r-0M for guix-patches@gnu.org; Fri, 10 Mar 2023 20:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62100] [PATCH v2 01/15] gnu: pre-commit: Update to 3.1.1. References: <20230310171727.14525-1-antero@mailbox.org> In-Reply-To: <20230310171727.14525-1-antero@mailbox.org> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Mar 2023 01:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62100@debbugs.gnu.org Cc: Antero Mejr Received: via spool by 62100-submit@debbugs.gnu.org id=B62100.167849831112106 (code B ref 62100); Sat, 11 Mar 2023 01:32:01 +0000 Received: (at 62100) by debbugs.gnu.org; 11 Mar 2023 01:31:51 +0000 Received: from localhost ([127.0.0.1]:56210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pao5P-00039A-3e for submit@debbugs.gnu.org; Fri, 10 Mar 2023 20:31:51 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:56950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pao5M-00038t-9Y for 62100@debbugs.gnu.org; Fri, 10 Mar 2023 20:31:49 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4PYQPS14y1z9sSg for <62100@debbugs.gnu.org>; Sat, 11 Mar 2023 02:31:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1678498300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6IaAR/TZP1B4glsSI450O4Pyco4Quc5or1aoKrrAn5o=; b=iGXKfchXiOzkKud/FfBS+mi2mdtTrwCdGh3WMieC0F+9oktvQ05DHTRdHZfTAy51Fqs0gV d9owUvr9lhEWeuEKTWbAK19KY5dRc8aKVYvsJ+ghwTHTW590vfueS78sNMLpaRD0eW+wjx E+t4h9TTilASU1KO43XFHY6PbcRiLfgAw8LQJyxRncPT3YLRDVTJZ+safIcAgr0GWKhLzs 99AwIZlAEdJn+V15VgqKWkF5u3d9szyXDIMyC+GkRy+2jpOwl4rphUcAyopUsrjCiIX6rw Asp235XSjKhdw99l3tKpZkCk4WLf041zUIAMyodMSskO0pvFhNJ1YKtAm7u3pg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1678498298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6IaAR/TZP1B4glsSI450O4Pyco4Quc5or1aoKrrAn5o=; b=XMQlVLRLKhgaOLDXPXOCq8n5/1PL631XQUHizBfLrXEua/xxeYeaJF5kfDYwiSpP4DQW/f 4il7dJlZ+5vFmV2wL7nKBJs06EfIDXu8SlM02+0GBIFzN/YyQnrVDHHCRTn6RPfykO/YP6 QoSI/Zxn6aVGozKl+8v8276cnGNYIPHRfk1PQdZKDJtvhOKTjlffFHNk+Ny03XCyFHSJ5a cbyvIdJOFBlH35oXTtR0nP498/uRsQW8zZZce+TQhP/ecY7bHa7nRv6RdoJ0mNj9Y2mgH1 PPzNW5/7ncnMYmM9+5fglQX0e+wfQFEnh7Vrcdegu9PJPkkCtueDoqgJIc1YWg== Date: Sat, 11 Mar 2023 01:31:11 +0000 Message-Id: <20230311013125.7182-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 36a000afbb92b627270 X-MBO-RS-META: dpg4r897e5yo4hosjbdwy8mdr7g7pf9y X-Rspamd-Queue-Id: 4PYQPS14y1z9sSg 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (pre-commit): Update to 3.1.1. [propagated-inputs]: Remove python-toml. --- gnu/packages/version-control.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8b0997768d..85291b12b7 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1667,8 +1667,8 @@ (define-public gitile (define-public pre-commit (package - (name "pre-commit") - (version "2.20.0") + (name "pre-commit") ;formerly known as python-pre-commit + (version "3.1.1") (source (origin (method git-fetch) ; no tests in PyPI release @@ -1677,7 +1677,11 @@ (define-public pre-commit (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19jcg6nfnscp87h4wmbpw6r3lc8c75zkvb6wqgavq5dh7wkyg6pq")))) + (base32 "1rngcq1vd2phk45wp1cc5jz02wpi53fif0qwk633smfjcjj1kp41")) + (modules '((guix build utils))) + (snippet '(substitute* "setup.cfg" + (("virtualenv>=20.10.0") ;our virtualenv (20.3.1) is fine + "virtualenv>=20.0.8"))))) (build-system python-build-system) (arguments `(#:phases @@ -1710,6 +1714,18 @@ (define-public pre-commit ;; Ruby and Node tests require node and gem. "--ignore=tests/languages/node_test.py" "--ignore=tests/languages/ruby_test.py" + ;; Skip lang-specific (network) tests added in 3.1.1 + "--ignore=tests/languages/conda_test.py" + "--ignore=tests/languages/coursier_test.py" + "--ignore=tests/languages/dart_test.py" + "--ignore=tests/languages/docker_test.py" + "--ignore=tests/languages/docker_image_test.py" + "--ignore=tests/languages/dotnet_test.py" + "--ignore=tests/languages/golang_test.py" + "--ignore=tests/languages/lua_test.py" + "--ignore=tests/languages/perl_test.py" + "--ignore=tests/languages/rust_test.py" + "--ignore=tests/languages/swift_test.py" "-k" (string-append ;; TODO: these tests fail with AssertionError. It may @@ -1717,7 +1733,8 @@ (define-public pre-commit "not test_install_existing_hooks_no_overwrite" " and not test_uninstall_restores_legacy_hooks" " and not test_installed_from_venv" - " and not test_healthy_venv_creator")))))))) + " and not test_healthy_venv_creator" + " and not test_r_hook and not test_r_inline")))))))) (native-inputs `(("git" ,git-minimal) ("python-covdefaults" ,python-covdefaults) @@ -1733,7 +1750,6 @@ (define-public pre-commit python-identify python-nodeenv python-pyyaml - python-toml python-virtualenv)) (home-page "https://pre-commit.com/") (synopsis "Framework for managing and maintaining pre-commit hooks")