From patchwork Fri Mar 10 17:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 47840 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 1F83616E7A; Fri, 10 Mar 2023 17:19:26 +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=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 030FB16E6D for ; Fri, 10 Mar 2023 17:19:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pagOa-0004bU-6W; Fri, 10 Mar 2023 12:19:08 -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 1pagOW-0004ay-RB for guix-patches@gnu.org; Fri, 10 Mar 2023 12:19:05 -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 1pagOV-0001T1-5M for guix-patches@gnu.org; Fri, 10 Mar 2023 12:19:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pagOU-00035O-6G; Fri, 10 Mar 2023 12:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62100] [PATCH] gnu: Remove python-pre-commit. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 10 Mar 2023 17:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62100@debbugs.gnu.org Cc: Antero Mejr , lars@6xq.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: lars@6xq.net Received: via spool by submit@debbugs.gnu.org id=B.167846868411680 (code B ref -1); Fri, 10 Mar 2023 17:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2023 17:18:04 +0000 Received: from localhost ([127.0.0.1]:55703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pagNY-00032J-By for submit@debbugs.gnu.org; Fri, 10 Mar 2023 12:18:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:58672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pagNV-00031u-Oe for submit@debbugs.gnu.org; Fri, 10 Mar 2023 12:18:02 -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 1pagNV-0004V5-IJ for guix-patches@gnu.org; Fri, 10 Mar 2023 12:18:01 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pagNT-0001A4-Da for guix-patches@gnu.org; Fri, 10 Mar 2023 12:18:01 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (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-102.mailbox.org (Postfix) with ESMTPS id 4PYCRb3BYHz9svW for ; Fri, 10 Mar 2023 18:17:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1678468667; 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=7zjVMYg0gqJmmHfpqQzLyCgbtyiohXe+M97A2O+4Tv0=; b=q4cvyuFdgBUxDyeB91o8/DP3/1+e2eYuhJFDKHH+fSycrm3CvJxtRinJeGfe9tYJAeKO6c HV5+i96a/n/WZdsPnEPARA1BjVuXhRjr0XbL0xuz1Z2DR4qcGh5jcv4acumg8Ejv4iCi9b 3xK2gwI3ZaG14AQfkFeNwHNjQMWr26rDds5nCt18MkdFUXEcbuVxcCOrgwfcPbtelMA9mu Zbk7CeTxrx+hdeYgDotuHqdYaVuIX1co0ind/vLgPx1rQPoZvSTPc24BmSNH/rVxWzPUw4 aQ7f/P9daMHX4OxL0Bp5H9sC3K/MIoTMyv4Xrmj3YTVQMxE+FjYUAq5q2COFGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1678468665; 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=7zjVMYg0gqJmmHfpqQzLyCgbtyiohXe+M97A2O+4Tv0=; b=xoS8AyhCPh3aFryrQyN4yArM0QlmfQ5nAGMlFPx1WV8nHVxO8SrqZd6Z80twFUtJ66ICo7 eE+qJsgN0HEcVljtIonGDxrNxSZJtTNG0MU0cDdd9TxCcUbx0ztK17cOWIMrJQPRd9SXe3 NdZ39MOrcPBD7IGKF+os9pxYNAe4GnysJ00jw8yIHqRgW3/vRFZDdGz5zK4J1jLiB2CSdc Ns9Y5TPO6mCUIA9ZPa8rj1KXQsYQt1py7gywkQu9gi7QAHI0nuN94wOX6NgIeMDHoNcKsI l2JjVrIjSaw+x1B62rLdRK8OXKa8WmD0mY11BRL2WJE19Ttedg2FLqSqEFfptg== Date: Fri, 10 Mar 2023 17:17:27 +0000 Message-Id: <20230310171727.14525-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-ID: 18aeb54a4bab4237c11 X-MBO-RS-META: xfjhtbnbcn64kh1oez6pjuw4xn1gcem5 X-Rspamd-Queue-Id: 4PYCRb3BYHz9svW Received-SPF: pass client-ip=80.241.56.152; envelope-from=antero@mailbox.org; helo=mout-p-102.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/python-xyz.scm (python-pre-commit): Delete variable. * gnu/packages/version-control.scm (pre-commit): Add comment referencing python-pre-commit. --- Please apply this patch last, after the rest of the series. Will cause ~70-80 rebuilds from what I can see. pre-commit and python-pre-commit are duplicates, but pre-commit is better packaged and newer. pre-commit should never be a native-input of python packages: it's a package manager for commit linting, which is completely irrelevant to builds. Resolves 53502: https://issues.guix.gnu.org/53502 gnu/packages/python-xyz.scm | 30 ------------------------------ gnu/packages/version-control.scm | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8243bb9fd3..b2fb60f322 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24284,36 +24284,6 @@ (define-public python-retrying @end itemize") (license license:asl2.0))) -(define-public python-pre-commit - (package - (name "python-pre-commit") - (version "2.10.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pre_commit" version)) - (sha256 - (base32 "1ycf6wpxrhxhdzz0vpryhbdxlwik5khgcvp3hxwvfr447a6k84zl")))) - (build-system python-build-system) - (arguments - ;; Tests fail with "AttributeError: module 'pre_commit.resources' has no - ;; attribute 'empty_template_setup'". - `(#:tests? #false)) - (propagated-inputs - (list python-cfgv - python-identify - python-importlib-metadata - python-nodeenv - python-pyyaml - python-toml - python-virtualenv)) - (home-page "https://github.com/pre-commit/pre-commit") - (synopsis "Framework for managing multi-language pre-commit hooks") - (description - "This package provides a framework for managing and maintaining -multi-language pre-commit hooks.") - (license license:expat))) - (define-public python-precis-i18n (package (name "python-precis-i18n") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8b0997768d..96378a73d3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1667,7 +1667,7 @@ (define-public gitile (define-public pre-commit (package - (name "pre-commit") + (name "pre-commit") ;formerly known as python-pre-commit (version "2.20.0") (source (origin