From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBC71158451 for ; Mon, 8 Jan 2024 14:48:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6D982BC015; Mon, 8 Jan 2024 14:48:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B485A2BC015 for ; Mon, 8 Jan 2024 14:48:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2F9B343322 for ; Mon, 8 Jan 2024 14:48:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FB991437 for ; Mon, 8 Jan 2024 14:48:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1704725296.6d20cb2240f31d928624f6961ad8e7271fb0d567.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/ X-VCS-Repository: repo/gentoo X-VCS-Files: metadata/install-qa-check.d/60python-pyc metadata/install-qa-check.d/60python-site X-VCS-Directories: metadata/install-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6d20cb2240f31d928624f6961ad8e7271fb0d567 X-VCS-Branch: master Date: Mon, 8 Jan 2024 14:48:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e477dae-e9c9-4ec2-b37c-b45f64bafc27 X-Archives-Hash: 690c03e6ee6b1f7535ab3e5497462c01 commit: 6d20cb2240f31d928624f6961ad8e7271fb0d567 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 5 14:08:52 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jan 8 14:48:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d20cb22 install-qa-check.d: Generalize 60python-{pyc → site} Rename `60python-pyc` check to `60python-site`, as it will be used to perform other checks on the site-packages directory. Signed-off-by: Michał Górny gentoo.org> .../{60python-pyc => 60python-site} | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-site similarity index 86% rename from metadata/install-qa-check.d/60python-pyc rename to metadata/install-qa-check.d/60python-site index fe4f3f62c4ef..5f812ecd01e1 100644 --- a/metadata/install-qa-check.d/60python-pyc +++ b/metadata/install-qa-check.d/60python-site @@ -1,10 +1,11 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# QA check: ensure that Python modules are compiled after installing +# QA checks related to site-packages directory: +# - missing, mismatched or stray .pyc files # Maintainer: Python project -python_pyc_check() { +python_site_check() { local save=$(shopt -p nullglob) shopt -s nullglob local progs=( "${EPREFIX}"/usr/lib/python-exec/*/gpep517 ) @@ -69,7 +70,7 @@ python_pyc_check() { eqawarn "not byte-compiled." eqawarn "The following files are missing:" eqawarn - eqatag -v python-pyc.missing "${missing[@]}" + eqatag -v python-site.pyc.missing "${missing[@]}" found=1 fi @@ -79,7 +80,7 @@ python_pyc_check() { eqawarn "that seem to be invalid (do not have the correct header)." eqawarn "The following files are invalid:" eqawarn - eqatag -v python-pyc.invalid "${invalid[@]}" + eqatag -v python-site.pyc.invalid "${invalid[@]}" found=1 fi @@ -88,7 +89,7 @@ python_pyc_check() { eqawarn "QA Notice: This package installs one or more compiled Python modules whose" eqawarn ".py files have different content (size or hash) than recorded:" eqawarn - eqatag -v python-pyc.mismatched.data "${mismatched_data[@]}" + eqatag -v python-site.pyc.mismatched.data "${mismatched_data[@]}" found=1 fi @@ -97,7 +98,7 @@ python_pyc_check() { eqawarn "QA Notice: This package installs one or more compiled Python modules whose" eqawarn ".py files have different timestamps than recorded:" eqawarn - eqatag -v python-pyc.mismatched.timestamp "${mismatched_timestamp[@]}" + eqatag -v python-site.pyc.mismatched.timestamp "${mismatched_timestamp[@]}" found=1 fi @@ -107,7 +108,7 @@ python_pyc_check() { eqawarn "that do not match installed modules (or their implementation)." eqawarn "The following files are stray:" eqawarn - eqatag -v python-pyc.stray "${stray[@]}" + eqatag -v python-site.pyc.stray "${stray[@]}" found=1 fi @@ -118,7 +119,7 @@ python_pyc_check() { fi } -python_pyc_check +python_site_check : # guarantee successful exit