From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609671; cv=none; d=zohomail.com; s=zohoarc; b=anhW/XtoHUqewRu3P6RutNd71gphuNSYEjdixC6eFcsPeqy5/ei5RiTdsqW/kRzAd7I7gyia6qefemTSJmXr2l6ydc7xSEr3FYqLIPsMvlzdj6q0WLVvYlI142GChBsw+7sC4zXMHvuHh/4g6m6iMIPVpt9X30UCFqZLyRWticI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609671; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=P+Lxbvy61kS2v9hVU4N3wFxEeJXomFNfrZVmQ/YqlvmFsG5f1BOMHoNXqa+fLCP8SNfTkBpqSWRAu73o007dBrI4p2RsRlOIMPAPYgpm26QCrSQLx3hddVtaIWj4Pv1gb3nKeGBz4pzPMO+eYwjSw5Obxs0K8EvvqVvC7KWzvIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609671269270.1073887408023; Sat, 20 May 2023 12:07:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Ruf-0007Ep-6q; Sat, 20 May 2023 15:06:45 -0400 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 1q0Ruc-0007E7-5E for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Rua-00006x-Nj for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:41 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-284-n3D8VNtDMQaGXtMT6F7DjA-1; Sat, 20 May 2023 15:06:37 -0400 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50bc456a94dso4375654a12.1 for ; Sat, 20 May 2023 12:06:37 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id z12-20020a50cd0c000000b00510da8aa2c6sm1084699edi.69.2023.05.20.12.06.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=TM8UjtXfH1JgbXOdPFIjy6yYNQx5CZNxhqJeU3FTRlZrivLZeSC7fLMwh221YDXMtXqZ1o TiMPS06OTlGX0vG5DmYq+x5wC+8IiGU4jcFs4/Ji7iDO5jrAPLbLcz1OSpRr+gw4EJD5Fd NCfUGvIXkhCNVqCbU3jhqLfuGjxbsl4= X-MC-Unique: n3D8VNtDMQaGXtMT6F7DjA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609596; x=1687201596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mo+ztAyGGiOip3OHpCp1FYFteyCn3B9iHVCaLmu1ZYw=; b=S9hE5adVPZo9RpkTTb3MsE1ROAp5l4hKOQ67RblHpaFHeFNauXAh3UN8sUTdHMcTei zWwNeNmZuDXN7a9jSda4motS89wZceUe6zq49p6MYIA4zK3xxee0GmWBpfQChH4QbzBJ EwZTEkgM9JciPvF2GXaw7RrAai+ZcGcv7AB6gEEVEqmFbM9zXdjO25kqYPCBHUBfon4j SvJv5R1Ssl35oL1xh6kkEwRMET9agKjwmHgssYfwSj9dR3hf6B+3qJzGwHnFLY4o7+pg 547D4/9qqPB3Vbw3i5pfvhXv5DMjpgoTtrzCqE4vQ5DEPkm4gULCK4nQZ2u+PQF65MvQ tbgg== X-Gm-Message-State: AC+VfDzGPfwnOw8WAxEXKXMJFllNxNuTtMcLXs6qUeRlsHvBX7bzCyBw kX75h1Jzvd2koX8JdX2s4iujSIx01KJhlEc9h0zDKAgvvSEoj9GPSDtfFRaYUNy/lBmnkVWmu75 SlDM7Qo4ln+whWYQn9fmm9/+qp4s+aS6aO5XpxSnEHfYk8mKpvAzDCDzkJPGTlz17akjtgG0oj9 s= X-Received: by 2002:aa7:c0d7:0:b0:50b:c971:c14b with SMTP id j23-20020aa7c0d7000000b0050bc971c14bmr4628175edp.11.1684609596341; Sat, 20 May 2023 12:06:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4pdUyIzu/7L+wUEH5pwsQMtzjVlIkqb5zWvGNQQZeeJJzN8rnoEQ9sGW9jtVRtE4y0t+t6ew== X-Received: by 2002:aa7:c0d7:0:b0:50b:c971:c14b with SMTP id j23-20020aa7c0d7000000b0050bc971c14bmr4628166edp.11.1684609595961; Sat, 20 May 2023 12:06:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/7] remove remaining traces of meson submodule Date: Sat, 20 May 2023 21:06:26 +0200 Message-Id: <20230520190632.7491-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609671728100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/buildtest-template.yml | 4 ---- scripts/archive-source.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 7edb50b76035..c9f2e737c09a 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -5,10 +5,6 @@ before_script: - JOBS=3D$(expr $(nproc) + 1) script: - - if test -n "$LD_JOBS"; - then - scripts/git-submodule.sh update meson ; - fi - mkdir build - cd build - ../configure --enable-werror --disable-docs --enable-fdt=3Dsystem diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 23e042dacdb3..c03532915471 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules=3D"dtc meson ui/keycodemapdb" +submodules=3D"dtc ui/keycodemapdb" submodules=3D"$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-= testfloat-3" sub_deinit=3D"" =20 --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609671; cv=none; d=zohomail.com; s=zohoarc; b=MAVPcBUmHsC4uAdpSkBjNJIJgmeLsVs/uhLs/JEiwcoLyt87FyRbQVQ+JPU/xyaqRdg+rfGstY/Kkj7MCx7L+H5rvHJgZPkXDi57MkeZ3EZOtBxoWJ3NfYbr4tg2lr63bTrXEXVH26ckjLkMBpIZm0UgnT7AHTnQeo21PyPOdlk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609671; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qlgzse35/U7pJowc/LVIUcU4eodAmYKoY3TprbNdG0Y=; b=ism2CgeLnKxQqdhBe8kz/ZIy5bsoxrqMXvEy7oIodyaqS7Mz/tz2U81487SZRkUxqJCo2KSsZn8V/IRT5ZtQ4DBK3l+O/m32tYznyKqmJtKbK8QaHQMyI2vBi2JDoWtN4UtBmARwGvn9TvimP3qF6ScKmZlPiqNGseCNpnMfXvc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609671198105.83595506498091; Sat, 20 May 2023 12:07:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Ruf-0007FB-Vv; Sat, 20 May 2023 15:06:46 -0400 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 1q0Rue-0007Eq-Q4 for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Ruc-00007I-Fm for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:43 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-5HFXBGuzMnWPgl2ZitATmQ-1; Sat, 20 May 2023 15:06:39 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a34a0b75eso449228066b.1 for ; Sat, 20 May 2023 12:06:39 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id mj14-20020a170906af8e00b009659fa6eeddsm1059894ejb.196.2023.05.20.12.06.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qlgzse35/U7pJowc/LVIUcU4eodAmYKoY3TprbNdG0Y=; b=f3oBINTDMTRF6ISd7KMnj7LxxtsLfDqqcxfICXfemfEQYC5l2M+SlgcT6z11RGV0AMNLC3 4GeY92Q6l+/Sbg4++JD0OrqwIpfg9u2iokA8/zW13A3lXXc3M2cIPNV/pRU43USBk0yW2s IFd+UKssEYrCezjDd+PyoucVUgmOa9A= X-MC-Unique: 5HFXBGuzMnWPgl2ZitATmQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609598; x=1687201598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qlgzse35/U7pJowc/LVIUcU4eodAmYKoY3TprbNdG0Y=; b=H763vCzP1ibjsFEZ04kh+w2CMV00ldUdv9J5r/BsQJJZ9Loq/NeX7Hh2IY4yqDOBKh TAEExVirG+koQj7G9IMaTNEyo5fNx5KMzKYYuhbNLEkcVibj5jkmDPWyo80w4QcwbdCf 573pRPpzKsxIxki0ZqDUCBuHnvizmeqi4o2O+NQ4Cf5QlayIDrAPgheC+mRrAxx2VLs5 6S0BGrTZzxe7/pu+i1qcaz62ADdSXsyPIo66z6R8icwO19NwDGSTQCMLpgVbgDXcVdRB E+gy6dmNvybVmpWI+pffGtdJCR4/syscCFA1959t2z7dVNs5Urvms0Hzf0Ftowj6udjE YJsg== X-Gm-Message-State: AC+VfDz/VtkTBZtmBKqwjh1EOXIYHlI8v5LhrVuFyOC29I0DfzdXZ1Z1 hZy1HlWsBLCAubNPBJTlUkmpwkm8ZkEqK0Fg2a9RLwzrKLjFKbJAFqzYNSXMOkTWTfXAsU0Kuf/ uZ9doX/u3ww3PgjwBAPzjBJoje7sRv5qAMpOL5dPr4g3emi5n37QYhrIDCVArqZu3lEazCWtGCL w= X-Received: by 2002:a17:907:6288:b0:96a:316f:8abf with SMTP id nd8-20020a170907628800b0096a316f8abfmr5747220ejc.20.1684609597941; Sat, 20 May 2023 12:06:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Dfhq1GB4O3ltKQYP0Ijh7yV/1DzMx4wpSgZS021nMfOlZT4Kp19UZN7Y4EpqiDG3iPRcDZw== X-Received: by 2002:a17:907:6288:b0:96a:316f:8abf with SMTP id nd8-20020a170907628800b0096a316f8abfmr5747209ejc.20.1684609597537; Sat, 20 May 2023 12:06:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/7] mkvenv: replace distlib.database with importlib.metadata/pkg_resources Date: Sat, 20 May 2023 21:06:27 +0200 Message-Id: <20230520190632.7491-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LONGWORDS=2.035, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609671754100002 Content-Type: text/plain; charset="utf-8" importlib.metadata is just as good as distlib.database and a bit more battle-proven for "egg" based distributions, and in fact that is exactly why mkvenv.py is not using distlib.database to find entry points: it simply does not work for eggs. The only disadvantage of importlib.metadata is that it is not available by default before Python 3.8, so we need a fallback to pkg_resources (again, just like for the case of finding entry points). Do so to fix issues where incorrect egg metadata results in a JSONDecodeError. While at it, reuse the new _get_version function to diagnose an incorrect version of the package even if importlib.metadata is not available. Signed-off-by: Paolo Bonzini --- python/scripts/mkvenv.py | 113 ++++++++++++++++++++++----------------- python/setup.cfg | 6 --- 2 files changed, 65 insertions(+), 54 deletions(-) diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py index 8c036c019aaf..6c78a2c1120e 100644 --- a/python/scripts/mkvenv.py +++ b/python/scripts/mkvenv.py @@ -76,7 +76,6 @@ Union, ) import venv -import warnings =20 =20 # Try to load distlib, with a fallback to pip's vendored version. @@ -84,7 +83,6 @@ # outside the venv or before a potential call to ensurepip in checkpip(). HAVE_DISTLIB =3D True try: - import distlib.database import distlib.scripts import distlib.version except ImportError: @@ -92,7 +90,6 @@ # Reach into pip's cookie jar. pylint and flake8 don't understand # that these imports will be used via distlib.xxx. from pip._vendor import distlib - import pip._vendor.distlib.database # noqa, pylint: disable=3Dunu= sed-import import pip._vendor.distlib.scripts # noqa, pylint: disable=3Dunus= ed-import import pip._vendor.distlib.version # noqa, pylint: disable=3Dunus= ed-import except ImportError: @@ -556,6 +553,57 @@ def pkgname_from_depspec(dep_spec: str) -> str: return match.group(0) =20 =20 +def _get_version_importlib(package: str) -> Optional[str]: + # pylint: disable=3Dimport-outside-toplevel + # pylint: disable=3Dno-name-in-module + # pylint: disable=3Dimport-error + try: + # First preference: Python 3.8+ stdlib + from importlib.metadata import ( # type: ignore + PackageNotFoundError, + distribution, + ) + except ImportError as exc: + logger.debug("%s", str(exc)) + # Second preference: Commonly available PyPI backport + from importlib_metadata import ( # type: ignore + PackageNotFoundError, + distribution, + ) + + try: + return str(distribution(package).version) + except PackageNotFoundError: + return None + + +def _get_version_pkg_resources(package: str) -> Optional[str]: + # pylint: disable=3Dimport-outside-toplevel + # Bundled with setuptools; has a good chance of being available. + import pkg_resources + + try: + return str(pkg_resources.get_distribution(package).version) + except pkg_resources.DistributionNotFound: + return None + + +def _get_version(package: str) -> Optional[str]: + try: + return _get_version_importlib(package) + except ImportError as exc: + logger.debug("%s", str(exc)) + + try: + return _get_version_pkg_resources(package) + except ImportError as exc: + logger.debug("%s", str(exc)) + raise Ouch( + "Neither importlib.metadata nor pkg_resources found. " + "Use Python 3.8+, or install importlib-metadata or setuptools." + ) from exc + + def diagnose( dep_spec: str, online: bool, @@ -581,26 +629,7 @@ def diagnose( bad =3D False =20 pkg_name =3D pkgname_from_depspec(dep_spec) - pkg_version =3D None - - has_importlib =3D False - try: - # Python 3.8+ stdlib - # pylint: disable=3Dimport-outside-toplevel - # pylint: disable=3Dno-name-in-module - # pylint: disable=3Dimport-error - from importlib.metadata import ( # type: ignore - PackageNotFoundError, - version, - ) - - has_importlib =3D True - try: - pkg_version =3D version(pkg_name) - except PackageNotFoundError: - pass - except ModuleNotFoundError: - pass + pkg_version =3D _get_version(pkg_name) =20 lines =3D [] =20 @@ -609,14 +638,9 @@ def diagnose( f"Python package '{pkg_name}' version '{pkg_version}' was foun= d," " but isn't suitable." ) - elif has_importlib: - lines.append( - f"Python package '{pkg_name}' was not found nor installed." - ) else: lines.append( - f"Python package '{pkg_name}' is either not found or" - " not a suitable version." + f"Python package '{pkg_name}' was not found nor installed." ) =20 if wheels_dir: @@ -711,21 +735,18 @@ def _do_ensure( :param online: If True, fall back to PyPI. :param wheels_dir: If specified, search this path for packages. """ - with warnings.catch_warnings(): - warnings.filterwarnings( - "ignore", category=3DUserWarning, module=3D"distlib" - ) - dist_path =3D distlib.database.DistributionPath(include_egg=3DTrue) - absent =3D [] - present =3D [] - for spec in dep_specs: - matcher =3D distlib.version.LegacyMatcher(spec) - dist =3D dist_path.get_distribution(matcher.name) - if dist is None or not matcher.match(dist.version): - absent.append(spec) - else: - logger.info("found %s", dist) - present.append(matcher.name) + absent =3D [] + present =3D [] + for spec in dep_specs: + matcher =3D distlib.version.LegacyMatcher(spec) + ver =3D _get_version(matcher.name) + if ver is None or not matcher.match( + distlib.version.LegacyVersion(ver) + ): + absent.append(spec) + else: + logger.info("found %s %s", matcher.name, ver) + present.append(matcher.name) =20 if present: generate_console_scripts(present) @@ -843,10 +864,6 @@ def main() -> int: if os.environ.get("V"): logging.basicConfig(level=3Dlogging.INFO) =20 - # These are incredibly noisy even for V=3D1 - logging.getLogger("distlib.metadata").addFilter(lambda record: Fal= se) - logging.getLogger("distlib.database").addFilter(lambda record: Fal= se) - parser =3D argparse.ArgumentParser( prog=3D"mkvenv", description=3D"QEMU pyvenv bootstrapping utility", diff --git a/python/setup.cfg b/python/setup.cfg index 5abb7d30ad42..42f0b0be07d1 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -115,9 +115,6 @@ ignore_missing_imports =3D True [mypy-distlib] ignore_missing_imports =3D True =20 -[mypy-distlib.database] -ignore_missing_imports =3D True - [mypy-distlib.scripts] ignore_missing_imports =3D True =20 @@ -127,9 +124,6 @@ ignore_missing_imports =3D True [mypy-pip._vendor.distlib] ignore_missing_imports =3D True =20 -[mypy-pip._vendor.distlib.database] -ignore_missing_imports =3D True - [mypy-pip._vendor.distlib.scripts] ignore_missing_imports =3D True =20 --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609678; cv=none; d=zohomail.com; s=zohoarc; b=fawDQdS9Er/YKKSlHvJf/AsMFvZ3BP4R7foPCBiU7RCDcTDIUHuYoluCcTJXBcq1DcfkUaL5POCV5ikqq3kN/j3He0IXRh18O7wRNaNLyt6srp0gjSPFjefAEDKRtvnte3pgcDFnHc3MkTMYsO1lBX4jsH4En7T6Bn18eZpy/KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609678; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=RW4PDK+/hB+JixayQt0HY9U7Ik0lcvWdEzDI3a8th0zgWkcubpiZ4052wXz+yJ3FCMl8rPOOtlJDge0RBw1kBaZ30WryGESW/21KZ/uwFwdf56Y30Gb+wEJaw9TEm5iGggtlPQxJAYAepYkPaplEFcTZXis4RLXLCFnhCH37zwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609678848850.2213467320199; Sat, 20 May 2023 12:07:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Rug-0007Fn-Oi; Sat, 20 May 2023 15:06:46 -0400 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 1q0Ruf-0007Ey-Ha for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Ruc-00007X-VB for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:45 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-XiE0EcBOM9aGQz4MQHwWsg-1; Sat, 20 May 2023 15:06:41 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-96f46e5897eso338824766b.3 for ; Sat, 20 May 2023 12:06:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id k17-20020a1709063e1100b0096f641a4c01sm1066943eji.179.2023.05.20.12.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=C2hPjJXD7QW+Kk97460XE7kO7JBK2X81Qkt7do+AUHRX4/YvXwoRJ7bxRCETjsPvWJ4aJs 7dnJuof+oBHZIdCPAXN3kzRBmhG0R+V49sEH8xPD1vbPLjL9xDQQ1Snce+x/+4kSWADfZu 9O6xLT7XnUwBKcV/8YQEf7Hfla7TB+w= X-MC-Unique: XiE0EcBOM9aGQz4MQHwWsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609599; x=1687201599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=QWiLn3pPcY3BVCzbtAUOc9lglqgm90uFiL1KMKbTDiJaHVPWaeFRMmdW5uYBUBpfoi yoSHyDosA8qI4ajzv81addm4GYQsVvcSRQZFvymk9K+cFgTjkNDhwgrsr3oi1xoZhQkf +qHr62Q9zKE8HK4BJRPaoHKdPng0h+kP5dvpqusppHp8Bik+mzN4GrLl9J6rLf5HCKYB qX+tLsPo0coDTgppiU/Ju5ySc7l9m0mU3p34ur2s28jCqXnsqDbyK3QCAsGKnl14itDZ K0bTQAy9uq9zdD+mgKGvaLSqo6Gum907cpXEV5UjeLQKdztM8+3G7uObfhXkiVgmALoL CDWg== X-Gm-Message-State: AC+VfDzcPqWeMa/+kzcn6Xrte9OtLYzUOZBD51fLtewC0xlkexZCnzSl 1Az1B1iP+L66XC5Kon2axnxf/uYF2mIWMYKG+yxi1ZntFH9qShh1rv4VgOxw6t19madyRHSkUTw umYWTq7CntBzzJiaYLzQb7cK2ydLjaxL+8MHtLRL7oMdhq7KQN2pTT1+uh6tnimBma/rBmiQDkP I= X-Received: by 2002:a17:907:720e:b0:94a:58a5:2300 with SMTP id dr14-20020a170907720e00b0094a58a52300mr5897407ejc.27.1684609599413; Sat, 20 May 2023 12:06:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kHcVrELgfH4EGc19JNilexRNP8FfM+hFFkMz6Ez1MZoB0hsufrl2p9wVc84WoKw+LS9OQAg== X-Received: by 2002:a17:907:720e:b0:94a:58a5:2300 with SMTP id dr14-20020a170907720e00b0094a58a52300mr5897389ejc.27.1684609599078; Sat, 20 May 2023 12:06:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 3/7] build: rebuild build.ninja using "meson setup --reconfigure" Date: Sat, 20 May 2023 21:06:28 +0200 Message-Id: <20230520190632.7491-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609679511100001 Content-Type: text/plain; charset="utf-8" Do not use the rule in build.ninja, because the path to meson is hardcoded in build.ninja and this breaks if meson moves (for example if the distro meson suddenly becomes too old after an update). Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Paolo Bonzini --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c7d67142f13..08fb6a3b058a 100644 --- a/Makefile +++ b/Makefile @@ -115,15 +115,15 @@ Makefile.ninja: build.ninja $(NINJA) -t query build.ninja | sed -n '1,/^ input:/d; /^ outputs:/q;= s/$$/ \\/p'; \ } > $@.tmp && mv $@.tmp $@ -include Makefile.ninja +endif =20 +ifneq ($(MESON),) # A separate rule is needed for Makefile dependencies to avoid -n build.ninja: build.ninja.stamp $(build-files): build.ninja.stamp: meson.stamp $(build-files) - $(NINJA) $(if $V,-v,) build.ninja && touch $@ -endif + $(MESON) setup --reconfigure $(SRC_PATH) && touch $@ =20 -ifneq ($(MESON),) Makefile.mtest: build.ninja scripts/mtest2make.py $(MESON) introspect --targets --tests --benchmarks | $(PYTHON) scripts/mt= est2make.py > $@ -include Makefile.mtest --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609689; cv=none; d=zohomail.com; s=zohoarc; b=dfKL2zn0rerz6d/kEAX/mYzGhRs3M62ExYns1OMXKLIPqUes3pWEdI6HbIfb1zeLG/7GAQF+kNHGdhSvp72BMfl3iIQiT+nga51L3ItGEZp748x0TUBzZbXdDMYU0YOiQjlXQpc26CVjjzRRjYcBmxjmr96YHOBgJloBE0P7/YE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QM2DMiqNlRp+JmlFPMLefbiTWEx8q3yu7MLoR53X3fw=; b=VdMPf7g2BJ9jytwp0RGsM8rMFvYY7fljIA0Rw4YhVYFsoU/x77qtoQWR6ELbRoMlYsDCkh6HXQQPZYC/kJNP7EvxPLa8u9xj1U6w90Pna7sVQbr/8Kp7vWBmh2FP2ZSQzCI3Ddv8S0FexYnYh9KV4E22LUYpMm+nSzPusQIYhEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609689954753.0849087322679; Sat, 20 May 2023 12:08:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Ruh-0007GC-T6; Sat, 20 May 2023 15:06:48 -0400 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 1q0Rug-0007FC-1Y for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Rue-00007i-JB for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:45 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-Av3kj5nHN5KOATsuPzLDbA-1; Sat, 20 May 2023 15:06:42 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-96f46e5897eso338825966b.3 for ; Sat, 20 May 2023 12:06:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id dc8-20020a170906c7c800b009531d9efcc4sm1067409ejb.133.2023.05.20.12.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QM2DMiqNlRp+JmlFPMLefbiTWEx8q3yu7MLoR53X3fw=; b=Pv5dF6DJkj+hznQeLA1NzBiMhJ3ZVYd+SeVAjh28qtmjjySTe+AFUtNDBhkpafZMDdu1HN CZkzA6qpYK55wI1FhyRUO6Rkb9Jrqgn1jmZpUI5CmItlgHVRcUn8mmPDLZql3rCFrfM6FB /pbfPAtOSkGjhaL0pTJz/JFrpr+LB68= X-MC-Unique: Av3kj5nHN5KOATsuPzLDbA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609600; x=1687201600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QM2DMiqNlRp+JmlFPMLefbiTWEx8q3yu7MLoR53X3fw=; b=fhCy6xmiGsauSaedPNHFKIyncgc3irddSfY2rwFKEbAOyHUfG+GCfzPHdZIDB9Izwu qmIOYfmRj7saPRM+jsiy7w9kRyhAEzIXll/lf3jZ2StTi43KfKgzcIUXBOezzYLvuHpg twwIeyuJh3FShBAulB/Y/5sKvB/yFRV4TvV9qwJtf8f0GrnTw5ZpudPAjsgmB7sc9Klq +gkc5Nl7HYuHebTJYHGdWH5RzSLzJaIV9NJLyLU6AfeoyChnKPiyiuT1CJm0RUD/KDqD IgDulv1XkL4Ym8a/r8x1uNrmWz7hHKdxgVj0f87XyuzHZUYYx0VOdD8Cqqyj7Xzw+kAf M2ZQ== X-Gm-Message-State: AC+VfDxCNDYsRNi///Ziqs/VvD3NzBEgVfIpzf283hovXfjzGZvH9Bs/ Y9WOLZx4wM/eIYw8bYutz7O5BaJH6Uq37LFCtoLHngJfP6PDqlkZufRKEdChzqHGok+WTKVunKe t2RwdVkmez4Uo2G5tGk4BUWQSbHnkT4kYFsyVbzQK0nitDP5AtKqmhRN+xHVQlGY0W1r0a5LB9/ 0= X-Received: by 2002:a17:906:58d4:b0:961:8fcd:53bc with SMTP id e20-20020a17090658d400b009618fcd53bcmr6484112ejs.21.1684609600800; Sat, 20 May 2023 12:06:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4LJLRCSohYgH18hVCmprNd74we2Q42J32O3yLqagZ8yCij43ZJuYKKIWYiys7IhTJUd8NzVA== X-Received: by 2002:a17:906:58d4:b0:961:8fcd:53bc with SMTP id e20-20020a17090658d400b009618fcd53bcmr6484104ejs.21.1684609600587; Sat, 20 May 2023 12:06:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 4/7] configure: fix backwards-compatibility for meson sphinx_build option Date: Sat, 20 May 2023 21:06:29 +0200 Message-Id: <20230520190632.7491-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609691663100007 Content-Type: text/plain; charset="utf-8" Reintroduce the cmd_line.txt mangling to remove the sphinx_build option when rerunning meson. The mechanism was removed in commit 75cc28648574 ("configure: remove backwards-compatibility code", 2023-01-11) because the fixups were obsolete at the time; however, the Meson deprecation mechanism doesn't quite work when options are finally removed, so we need to bring it back. Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configure b/configure index bcab685cfd97..f7cd376e525f 100755 --- a/configure +++ b/configure @@ -1987,6 +1987,14 @@ if test "$skip_meson" =3D no; then if test "$?" -ne 0 ; then error_exit "meson setup failed" fi +else + if test -f meson-private/cmd_line.txt; then + # Adjust old command line options that were removed + # sed -i is not portable + perl -i -ne ' + /^sphinx_build/ && next; + print;' meson-private/cmd_line.txt + fi fi =20 # Save the configure command line for later reuse. --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609694; cv=none; d=zohomail.com; s=zohoarc; b=B9OgL3L1/rsxZPYT+3eFGtV2+HTiTrqiklZFDZVcra0+v9QAMb+1bxPfKVBoLmGB83kley2mneHoxxaJYOvY/eH5USnn2/tTl2CuGu3KYiCEPpS//acrBly7OB8TN1tvFVpmD/ePcOpVp4+3K1GS0zuEvL1mgCUs1Xs1WrNqQqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609694; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c8UYDmpTcBJj16+BuGQN1qnrqBAgf8A4hb7KM89B/ts=; b=ItdxFrmpKc7Qk49e9HRYMkseH5HNOUJBlLum69dG/9SpScUJNA0OL4iRT/GnwGAuFokvjazRVEY51+OHkaPu8h14f5gEMn6QznNkcGEA2dnsu7t0xQtWROtViDHuPOQiSbCyaqSc9wCJPIGg1mJZqnVC9vB1f2tRnqB7DxTXCUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609694729204.05468884011623; Sat, 20 May 2023 12:08:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Ruj-0007GQ-Jh; Sat, 20 May 2023 15:06:49 -0400 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 1q0Ruh-0007G4-LA for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Rug-00008A-5Q for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:47 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-540-l4SVb31pNTOTfwh1kiavxA-1; Sat, 20 May 2023 15:06:43 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a34d3e5ebso449224366b.3 for ; Sat, 20 May 2023 12:06:43 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id gu12-20020a170906f28c00b00966069b78absm1066356ejb.192.2023.05.20.12.06.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c8UYDmpTcBJj16+BuGQN1qnrqBAgf8A4hb7KM89B/ts=; b=QTUUZ3jUnS7a0acbCfX0n9DEQxF1Cc+X4SKrpYL7SP7kWWLT741dBYiS9IVqZD+lsmdnlg Dx9J9+N7vYxs5w4ldrbDzK7gdfRvhteoiaDJgPp0ODeA0ARzrTEqQBCsa/60zvmSd8lLT8 PaoYKlUipOsCeiwhLOeTzI3waTcUeMo= X-MC-Unique: l4SVb31pNTOTfwh1kiavxA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609602; x=1687201602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c8UYDmpTcBJj16+BuGQN1qnrqBAgf8A4hb7KM89B/ts=; b=VjF3M+aADZXlCWp9+SwlAGM8Grme/gsrNcwFm+Kgdu/WVgKI70ofQZFW4N02mTdLu1 GsLfablun+ElkCxPZxzNANTkYeNX3TTxNEMHiYaiaL9fFcQAMAwy0PRy6SVe8AX6DWWr 4RabxATXOOIJn7nLvp5yC4Y+XO8moDrM8o28QMsIu6khY7fvbeNri1uvIE1Rww4tx9vz 1yi0KlEDr9dfIQXuMsrkRfBl3sVl4WH+bcjRIFVkxpMwmdqOYwLnYOUgVzydUESnjJu5 bRTJvZ7CkIZTENKVIhe3xeEGq818n2nSr63lNDKRvQU3OqRAYHvZSd4xB8oZrVH5ELRm 2H0w== X-Gm-Message-State: AC+VfDwibJLoWKS1eUWCKyR5ya9uYNVEAX9It62pSGw4pZTmIJh6D+lW hfndoqbQRdOWtPAkYIrhaD2FKU9PivM1DLAz/s5gFH1Ei4jCez3uLcPwJPqRUewvmDab0WwqUaU T7G67VpWcQ4S7jDocWlDBenZf5Of9OzoEEoz1r2nC2/htuah+/VQOE4uaxyo87Qn7Qbg+jlswWU k= X-Received: by 2002:a17:907:3e95:b0:958:772e:e926 with SMTP id hs21-20020a1709073e9500b00958772ee926mr5550464ejc.24.1684609602389; Sat, 20 May 2023 12:06:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wxvQuIYkrxkFWs8s56fLZ7nlbyTJfXbT6GnI3xdWv/iCNosLGB4b86tvBuWCs6DQEbEASCQ== X-Received: by 2002:a17:907:3e95:b0:958:772e:e926 with SMTP id hs21-20020a1709073e9500b00958772ee926mr5550446ejc.24.1684609601973; Sat, 20 May 2023 12:06:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/7] mkvenv: pass first missing package to diagnose() Date: Sat, 20 May 2023 21:06:30 +0200 Message-Id: <20230520190632.7491-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609696259100003 If sphinx is present but the theme is not, mkvenv will print an inaccurate diagnostic: ERROR: Could not find a version that satisfies the requirement sphinx-rtd-t= heme>=3D0.5.0 (from versions: none) ERROR: No matching distribution found for sphinx-rtd-theme>=3D0.5.0 'sphinx>=3D1.6.0' not found: =E2=80=A2 Python package 'sphinx' version '5.3.0' was found, but isn't sui= table. =E2=80=A2 mkvenv was configured to operate offline and did not check PyPI. Instead, ignore the packages that were found to be present, and report an error based on the first absent package. Signed-off-by: Paolo Bonzini --- python/scripts/mkvenv.py | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py index 6c78a2c1120e..3a9aef46a513 100644 --- a/python/scripts/mkvenv.py +++ b/python/scripts/mkvenv.py @@ -722,7 +722,8 @@ def _do_ensure( dep_specs: Sequence[str], online: bool =3D False, wheels_dir: Optional[Union[str, Path]] =3D None, -) -> None: + prog: Optional[str] =3D None, +) -> Optional[Tuple[str, bool]]: """ Use pip to ensure we have the package specified by @dep_specs. =20 @@ -752,10 +753,24 @@ def _do_ensure( generate_console_scripts(present) =20 if absent: - # Some packages are missing or aren't a suitable version, - # install a suitable (possibly vendored) package. - print(f"mkvenv: installing {', '.join(absent)}", file=3Dsys.stderr) - pip_install(args=3Dabsent, online=3Donline, wheels_dir=3Dwheels_di= r) + if online or wheels_dir: + # Some packages are missing or aren't a suitable version, + # install a suitable (possibly vendored) package. + print(f"mkvenv: installing {', '.join(absent)}", file=3Dsys.st= derr) + try: + pip_install(args=3Dabsent, online=3Donline, wheels_dir=3Dw= heels_dir) + return None + except subprocess.CalledProcessError: + pass + + return diagnose( + absent[0], + online, + wheels_dir, + prog if absent[0] =3D=3D dep_specs[0] else None, + ) + + return None =20 =20 def ensure( @@ -785,14 +800,12 @@ def ensure( if not HAVE_DISTLIB: raise Ouch("a usable distlib could not be found, please install it= ") =20 - try: - _do_ensure(dep_specs, online, wheels_dir) - except subprocess.CalledProcessError as exc: + result =3D _do_ensure(dep_specs, online, wheels_dir, prog) + if result: # Well, that's not good. - msg, bad =3D diagnose(dep_specs[0], online, wheels_dir, prog) - if bad: - raise Ouch(msg) from exc - raise SystemExit(f"\n{msg}\n\n") from exc + if result[1]: + raise Ouch(result[0]) + raise SystemExit(f"\n{result[0]}\n\n") =20 =20 def post_venv_setup() -> None: --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609683; cv=none; d=zohomail.com; s=zohoarc; b=FrkA21SYKEPs2uXBWf7su6VVctRtohgyF6WohaR6NVkeJWMxQoTDE85ncGJF8DNIeFl45y+up+ZzqPC04eOHnII0aVmuLf1B9ZLBhDDGKWBsOdzkCih1WCVwCVI+tP3oCKfjsLCnPliY64vA+RnEsW8cZi2gQHekay8hoOdHEzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609683; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YDil6ojXcrA8yrvkIjnS2BxrShNRD12fHk2YDYi2Uro=; b=CAzptpSbGBpldzqSzOIKBqKejunIh5oLX2enfdJWCA53dkGuhLOfFvr4uzeG2hvtle8m8xt7Xz8UCRlFroYhRsjh4yuc6Do62XbMV9ikL05DvRzKjbFhtd7MoQGzHUTDU0mhagJhd0JFZOWwXxAbup4oTDiSf+LgBRTviLIG8Ic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609683852200.00907355019854; Sat, 20 May 2023 12:08:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Ruj-0007GS-MP; Sat, 20 May 2023 15:06:49 -0400 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 1q0Rui-0007GE-9q for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Rug-00008M-SP for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:48 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-JJGy4Bu0Pai6O_S8cx5FKA-1; Sat, 20 May 2023 15:06:45 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-94a355c9028so541644266b.3 for ; Sat, 20 May 2023 12:06:44 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id e16-20020a170906845000b00965cd3a037fsm1074093ejy.112.2023.05.20.12.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YDil6ojXcrA8yrvkIjnS2BxrShNRD12fHk2YDYi2Uro=; b=Fp8hHeavC8YTlSkhhHO4l2kXIjI2ODq/zIoSzohHDbaS8bKL6eU4KJvmI7BvLr9fr9BKMI ha3Vj+zXWQo3CaDMqRtmIE4aOeC9OUEGh3fdoW7mhKDG27SsRNjDQoeBI4Bxk/iC+l6gqT Ntouzunr5QiktIO+a2bwOR0EmbCgcdY= X-MC-Unique: JJGy4Bu0Pai6O_S8cx5FKA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609603; x=1687201603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YDil6ojXcrA8yrvkIjnS2BxrShNRD12fHk2YDYi2Uro=; b=IzJfrUSFT5IkCGxYj314FdWlNf+Xp8W8PmIFhQadV5WTiDn8ETyrrhGNJB2Lv0CL5J DVnGuELrgFMgB+Tqler50TE64L+EIz6bOvsw+aN95GZqOpPxmcHHXcwR67cL+CDxWyAd FbkFHDW7p+MvftsOPj+IGhhB/IcWyobfM9aInDR3vJ4RGpNlJHXoKIRuxy/JBbBzLxJc YAG6CdSttbHaWK70Q9UoE8hqt7TzSb/YuLq99muPCrESXLY1wT6nKTDCun7g3LYXfqFS o17QUq6f9mPLuWriizJC3jf+fKb1OGoqDKMSUqphY4qLnn0fTcFOtsB9n4pwYoG7Hd/+ mQpw== X-Gm-Message-State: AC+VfDzVaK9VYF18FsDPnZCxE3YrHC2H6lSZmSKzoa1IBuwtrVQkLYNH zWYczB0SB4G2mjA7XZ8xAMsmWAq96Oe2SYEi4XIIWarrZA7qam080QzDo7IWAE2/3fFDa5O/Sar 8mM7vaIw/GSNccUgZuQBY36eD+YBoxeqdPIVCv3KOPfMAZx4FiXm8bKt58pRWKpVPfGWtr2SCfd 8= X-Received: by 2002:a17:906:9743:b0:96f:32ae:a7e1 with SMTP id o3-20020a170906974300b0096f32aea7e1mr6404193ejy.63.1684609603448; Sat, 20 May 2023 12:06:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7P1u4EbnaIj1uyW3bjFi5u3DVH7KC2d9C7acMeMLgYA/aXf7OwuboswgfHGo8l5CgmRysiIQ== X-Received: by 2002:a17:906:9743:b0:96f:32ae:a7e1 with SMTP id o3-20020a170906974300b0096f32aea7e1mr6404179ejy.63.1684609603225; Sat, 20 May 2023 12:06:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 6/7] gitlab: custom-runners: preserve more artifacts for debugging Date: Sat, 20 May 2023 21:06:31 +0200 Message-Id: <20230520190632.7491-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609685667100003 Content-Type: text/plain; charset="utf-8" Since custom runners are not generally available, make it possible to debug the differences between a successful and a failing build by comparing the logs and the build.ninja rules. Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/custom-runners.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.= yml index 34a1e6f32735..8e5b9500f401 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -20,8 +20,10 @@ variables: artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days + when: always paths: - - build/meson-logs/testlog.txt + - build/build.ninja + - build/meson-logs reports: junit: build/meson-logs/testlog.junit.xml =20 --=20 2.40.1 From nobody Sun May 19 11:37:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684609701; cv=none; d=zohomail.com; s=zohoarc; b=cvQeHsRaDonH+wq5SLAx5TAbYQbqPjN/c3AW2g3I6KKNGPC6nwdOKSxC9CI82NaY/nhQa2XPmtVzTTb/R5/JNv6k/npJaJbnxrhCXebUxMFBplQ2TRjGiuT6rwMlz/uFh1rj2RFItaHsV404JtrqAd/a00nQ2igd/AbgwAKXKQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684609701; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7+uAVWJIlaKEAvLadAmkjz7dYWA6Y4OgVYfAWCmHVUA=; b=MqjhdI6sIznZJPVO8DrMjCkqumka7qrxUFvYQaH2CzntGaXwyOq1unXiDWoqc0dvzss9QWZOBsILhZc1T6Lap3Ge/Pp6BLx8Y4tHIyrYU5c+GsqYbmixyJOTqahNJ5O1Pio1M8T4LrRD7oUSulF45jDKuWmMEe/K2UG9Gf3HJqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684609701126288.52874636959416; Sat, 20 May 2023 12:08:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0Rum-0007H6-CF; Sat, 20 May 2023 15:06:52 -0400 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 1q0Ruk-0007Gv-RT for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q0Ruj-00008p-BE for qemu-devel@nongnu.org; Sat, 20 May 2023 15:06:50 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-352-KWfA_EiqPsiLPATEWhsq-A-1; Sat, 20 May 2023 15:06:46 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-96f6e83685eso197667566b.1 for ; Sat, 20 May 2023 12:06:46 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d18-20020aa7d5d2000000b0050bc9ffed66sm1054453eds.53.2023.05.20.12.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 12:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684609608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7+uAVWJIlaKEAvLadAmkjz7dYWA6Y4OgVYfAWCmHVUA=; b=fN+f5Ap5WVGuuj7mv0htUctSbtEGpy2nnFycSILriJSzc6eI2uS4pnxGUc1+joYqPxlWbk Ud5taJZu724QJR3nEZLO/u7wPhrQuT6kV5MyuO0Zwssi23VQ0+jMfYj4sutz1X84fos9bN QONJyq9DzZaft/3FBGLS067MEDaNz4k= X-MC-Unique: KWfA_EiqPsiLPATEWhsq-A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684609605; x=1687201605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7+uAVWJIlaKEAvLadAmkjz7dYWA6Y4OgVYfAWCmHVUA=; b=VV7ZKyn8mcSirALsAEmNSYHBuR+i1ESfcfxnZ0HhGjLSQ4ILOaNLWLhV2OtaBISbY0 s/L+Mfb8JybZU5p+G5wjdLUhe92rFiFgTx2iGF4EBDitiiPz4GX396JFFpRESXwuF0YU CWuxlZFkguFFiF31Qv/y+XUrO55rlyLuu8cGboRaP+zJIzcz08KqHXCDA/+2jv4kJCGB euKS6PQ0P+6bvebRP0Kw9U4sP4WXMF0h/AEcFkN1ToNN0nH5afDVttfpiN35n9BxzHBu z3jG41nLeQRqb11/I7khZWOsDAZfZirDNVZgMbTsks6dJDMcccs9o0Jm1gvtG8uWWZZJ x/7g== X-Gm-Message-State: AC+VfDxqWx7tJ3hJI3sRkDumcCBaXQcvuwSjApby6qH72Zq0fYXybn0A sLRAKQ43bDIeFVmK2bbfdZ2tNNYqaxXT2JEeDvliZMYwamqZWxkbdDDstTWffWNwaqWzH7ZYZzc w3ARrqatvIO054j4D0SVqS6kEjlsSYHoctRPxwi9lcuNgSW+JxX9oPc/BNA2LbsANINSS9+AO1x E= X-Received: by 2002:a17:907:628f:b0:961:b0:3dfd with SMTP id nd15-20020a170907628f00b0096100b03dfdmr5829503ejc.7.1684609605177; Sat, 20 May 2023 12:06:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ggwsgVXn7Gn+GEtxrIxG+oIBcKzUqsORxSksPhqs3O4pTq4j/QR1ZO5JTrXflOq5QQ0u+Yg== X-Received: by 2002:a17:907:628f:b0:961:b0:3dfd with SMTP id nd15-20020a170907628f00b0096100b03dfdmr5829494ejc.7.1684609604928; Sat, 20 May 2023 12:06:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 7/7] scripts: make sure scripts are invoked via $(PYTHON) Date: Sat, 20 May 2023 21:06:32 +0200 Message-Id: <20230520190632.7491-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230520190632.7491-1-pbonzini@redhat.com> References: <20230520190632.7491-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684609702274100001 Content-Type: text/plain; charset="utf-8" Some scripts are invoked via the first "python3" binary in the PATH, because they are executable and their shebang line is "#! /usr/bin/env python3". To enforce usage of $(PYTHON), make them nonexecutable. Scripts invoked via meson need nothing else, and meson-buildoptions.py is already using $(PYTHON). For probe-gdb-support.py however the invocation in the configure script has to be adjusted. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 2 +- scripts/meson-buildoptions.py | 0 scripts/modinfo-collect.py | 0 scripts/modinfo-generate.py | 0 scripts/probe-gdb-support.py | 0 5 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 =3D> 100644 scripts/meson-buildoptions.py mode change 100755 =3D> 100644 scripts/modinfo-collect.py mode change 100755 =3D> 100644 scripts/modinfo-generate.py mode change 100755 =3D> 100644 scripts/probe-gdb-support.py diff --git a/configure b/configure index f7cd376e525f..1bdc7fd69b7b 100755 --- a/configure +++ b/configure @@ -1767,7 +1767,7 @@ if test -n "$gdb_bin"; then gdb_version=3D$($gdb_bin --version | head -n 1) if version_ge ${gdb_version##* } 9.1; then echo "HAVE_GDB_BIN=3D$gdb_bin" >> $config_host_mak - gdb_arches=3D$("$source_path/scripts/probe-gdb-support.py" $gdb_bi= n) + gdb_arches=3D$($python "$source_path/scripts/probe-gdb-support.py"= $gdb_bin) else gdb_bin=3D"" fi diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py old mode 100755 new mode 100644 diff --git a/scripts/modinfo-collect.py b/scripts/modinfo-collect.py old mode 100755 new mode 100644 diff --git a/scripts/modinfo-generate.py b/scripts/modinfo-generate.py old mode 100755 new mode 100644 diff --git a/scripts/probe-gdb-support.py b/scripts/probe-gdb-support.py old mode 100755 new mode 100644 --=20 2.40.1