From nobody Mon Feb 9 08:10:15 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1764043379; cv=none; d=zohomail.com; s=zohoarc; b=Fd2mXCwtKURb0CueqUtsJf4POaawPUgfgZVvB4+Y3bkh8YrscbvOrnI84w+CsYHw4GbJxJUvnfSXo8UlgbFwuUABDV4Js5Z64gmQu8AuB05LpBfVtrXoCcGsFdvVs1m4R6cUbysYsfa3lq7DSwCVbqGAzUjoTC9kcl2R5SxOhZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764043379; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5aORpbOHQiUD7YIZYk9l72cbOqn2me+6oKpQYUYaXHk=; b=dxBnrP6EDTFwnQ7bhFLNzd3frtPHggZMhMnDQyN+3U46vNehYFN/hUK+9cVaITntPuf+YClQ+ZHLbY2tVKAZ4KFcrQEuJHnTG7O7ovbOn0ODEYr01e6BbZsuaTHwAwjVCr4Tbq92fxNfw/eY5YxtxBKp1DPC5b3a6rGXFV2p2Aw= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176404337911757.28948780264761; Mon, 24 Nov 2025 20:02:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNkGB-0004Du-ER; Mon, 24 Nov 2025 23:02:35 -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 1vNkF4-0003OW-O5 for qemu-devel@nongnu.org; Mon, 24 Nov 2025 23:01:28 -0500 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 1vNkF2-0006aY-Oe for qemu-devel@nongnu.org; Mon, 24 Nov 2025 23:01:25 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-570-RaAQrgpUMTS2wpPALZPLVQ-1; Mon, 24 Nov 2025 23:01:20 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ECD641954B21; Tue, 25 Nov 2025 04:01:18 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.114]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 00FE41800451; Tue, 25 Nov 2025 04:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764043284; 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: in-reply-to:in-reply-to:references:references; bh=5aORpbOHQiUD7YIZYk9l72cbOqn2me+6oKpQYUYaXHk=; b=YQW7LCjUg5000GklqW5IqF9JvpcE9TNVm43xsB1Jqp3lMRS+5LYN3XoggEnQGjt3h/owWM VK94ylC7HnCz7xwOhVySdRUVdnN+1Ei90Ot1P0RyLtse9EegqScXcq2Mhs/m0T9OnR3BPj 8p6TWkEHZn0HIqXuT/AlXjRt42hwxjI= X-MC-Unique: RaAQrgpUMTS2wpPALZPLVQ-1 X-Mimecast-MFC-AGG-ID: RaAQrgpUMTS2wpPALZPLVQ_1764043279 From: John Snow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow , Markus Armbruster , Hanna Reitz , Thomas Huth , Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cleber Rosa , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Kevin Wolf , qemu-block@nongnu.org Subject: [PATCH v2 12/16] python/mkvenv: add mechanism to install local package(s) Date: Mon, 24 Nov 2025 23:00:40 -0500 Message-ID: <20251125040045.461148-13-jsnow@redhat.com> In-Reply-To: <20251125040045.461148-1-jsnow@redhat.com> References: <20251125040045.461148-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.075, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1764043380161019200 Content-Type: text/plain; charset="utf-8" Currently, we "implicitly" install the local 'qemu' python package for 'make check-venv' with some logic inside tests/Makefile.include. I would like to make this installation explicit in pythondeps.toml instead. The version constraint specification that Python specifies does not support relative paths, so it is difficult (or impossible?) to specify a path within the source tree, and we will need a workaround to do so. By specifying a package name that starts with $SRCROOT, you can now specify a file path to a local package for installation. This is done to allow us to install the python packages hosted inside of the tree while also processing dependencies; i.e. so that our "qemu" package can specify that it needs "qemu.qmp", which soon will not be included in qemu.git. This also has the benefit of being able to specify in a declarative configuration file that our pyvenv environment *will* have our local python packages installed and available without any PYTHONPATH hacks, which should simplify iotests, device-crash-test and functional tests without needing to manage local inclusion paths in environment variables. Signed-off-by: John Snow --- python/scripts/mkvenv.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py index a22e3ee3394..e38292b63a6 100644 --- a/python/scripts/mkvenv.py +++ b/python/scripts/mkvenv.py @@ -736,6 +736,10 @@ def _do_ensure( present =3D [] canary =3D None for name, info in group.items(): + if name.startswith("$SRCROOT/"): + srcroot =3D Path(__file__).parents[2] + absent.append(name.replace("$SRCROOT/", f"file:///{srcroot}/")) + continue constraint =3D _make_version_constraint(info, False) matcher =3D Matcher(name + constraint) print(f"mkvenv: checking for {matcher}", file=3Dsys.stderr) --=20 2.51.1