From nobody Mon Feb 9 11:06:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639602656078284.0988259037413; Wed, 15 Dec 2021 13:10:56 -0800 (PST) Received: from localhost ([::1]:58772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxbY6-0004GG-J2 for importer@patchew.org; Wed, 15 Dec 2021 16:10:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxbVa-0002Mm-LH for qemu-devel@nongnu.org; Wed, 15 Dec 2021 16:08:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxbVX-0006Wd-LQ for qemu-devel@nongnu.org; Wed, 15 Dec 2021 16:08:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-acXw4jNqO6q00ZB4JQv2uQ-1; Wed, 15 Dec 2021 16:08:12 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A2F510151E0; Wed, 15 Dec 2021 21:08:10 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.19.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id A99235F4E1; Wed, 15 Dec 2021 21:07:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639602494; 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=7QqEykcf5R7WqKIajTVv15J/QOBDgnpjVdT4Ag8JfWw=; b=SaSjg1HawkfdIaIJsz+Uyx8NUQxQJub0pFpi/4CVmQ8y1FCIs68yTGblTw94CuzwVXz55m yzsjvP9FuvPFXVBSHZYOwW5yBMCD3OH2SomD5GCjnSMAduwodyMqEmQ36ALSF1Q5AmzCE1 h9eNunDn6J/GwVNJmHoXuU1VJ6mjKZs= X-MC-Unique: acXw4jNqO6q00ZB4JQv2uQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [RFC qemu.qmp PATCH 01/24] Fork qemu.qmp from qemu.git Date: Wed, 15 Dec 2021 16:06:11 -0500 Message-Id: <20211215210634.3779791-2-jsnow@redhat.com> In-Reply-To: <20211215210634.3779791-1-jsnow@redhat.com> References: <20211215210634.3779791-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.719, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Cc: Eduardo Habkost , "Daniel P . Berrange" , Beraldo Leal , Wainer dos Santos Moschetta , Gerd Hoffmann , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639602656951100001 Content-Type: text/plain; charset="utf-8" Split python/ from qemu.git, using these commands: > git subtree split -P python/ -b python-split-v2 > mkdir ~/src/tmp > cd ~/src/tmp > git clone --no-local --branch python-split-v2 --single-branch ~/src/qemu > cd qemu > git filter-repo --path qemu/machine/ \ --path qemu/utils/ \ --path tests/iotests-mypy.sh \ --path tests/iotests-pylint.sh \ --invert-paths This commit performs some minimum cleanup to reflect the deletion of the other subpackages. It is not intended to be exhaustive, and further edits are made in forthcoming commits. Signed-off-by: John Snow --- .gitignore | 2 +- Makefile | 16 ++++++++-------- setup.cfg | 24 +----------------------- setup.py | 2 +- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 904f324..b071f02 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ # python packaging build/ dist/ -qemu.egg-info/ +qemu.qmp.egg-info/ =20 # editor config .idea/ diff --git a/Makefile b/Makefile index 3334311..a2d2f2c 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ help: @echo "" @echo "make develop:" @echo " Install deps needed for for 'make check'," - @echo " and install the qemu package in editable mode." + @echo " and install the qemu.qmp package in editable mode." @echo " (Can be used in or outside of a venv.)" @echo "" @echo "make pipenv" @@ -43,7 +43,7 @@ help: @echo " Remove package build output." @echo "" @echo "make distclean:" - @echo " remove pipenv/venv files, qemu package forwarder," + @echo " remove pipenv/venv files, qemu.qmp package forwarder," @echo " built distribution files, and everything from 'make clean'." @echo "" @echo -e "Have a nice day ^_^\n" @@ -64,11 +64,11 @@ dev-venv: $(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate $(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate: setup.cfg @echo "VENV $(QEMU_VENV_DIR)" @python3 -m venv $(QEMU_VENV_DIR) - @( \ - echo "ACTIVATE $(QEMU_VENV_DIR)"; \ - . $(QEMU_VENV_DIR)/bin/activate; \ - echo "INSTALL qemu[devel] $(QEMU_VENV_DIR)"; \ - make develop 1>/dev/null; \ + @( \ + echo "ACTIVATE $(QEMU_VENV_DIR)"; \ + . $(QEMU_VENV_DIR)/bin/activate; \ + echo "INSTALL qemu.qmp[devel] $(QEMU_VENV_DIR)"; \ + make develop 1>/dev/null; \ ) @touch $(QEMU_VENV_DIR) =20 @@ -106,6 +106,6 @@ clean: =20 .PHONY: distclean distclean: clean - rm -rf qemu.egg-info/ .venv/ .tox/ $(QEMU_VENV_DIR) dist/ + rm -rf qemu.qmp.egg-info/ .venv/ .tox/ $(QEMU_VENV_DIR) dist/ rm -f .coverage .coverage.* rm -rf htmlcov/ diff --git a/setup.cfg b/setup.cfg index 911ae02..9999bca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name =3D qemu +name =3D qemu.qmp version =3D file:VERSION maintainer =3D QEMU Developer Team maintainer_email =3D qemu-devel@nongnu.org @@ -25,8 +25,6 @@ classifiers =3D python_requires =3D >=3D 3.6 packages =3D qemu.qmp - qemu.machine - qemu.utils =20 [options.package_data] * =3D py.typed @@ -38,7 +36,6 @@ packages =3D devel =3D avocado-framework >=3D 90.0 flake8 >=3D 3.6.0 - fusepy >=3D 2.0.4 isort >=3D 5.1.2 mypy >=3D 0.770 pylint >=3D 2.8.0 @@ -47,10 +44,6 @@ devel =3D urwid-readline >=3D 0.13 Pygments >=3D 2.9.0 =20 -# Provides qom-fuse functionality -fuse =3D - fusepy >=3D 2.0.4 - # AQMP TUI dependencies tui =3D urwid >=3D 2.1.2 @@ -59,13 +52,6 @@ tui =3D =20 [options.entry_points] console_scripts =3D - qom =3D qemu.utils.qom:main - qom-set =3D qemu.utils.qom:QOMSet.entry_point - qom-get =3D qemu.utils.qom:QOMGet.entry_point - qom-list =3D qemu.utils.qom:QOMList.entry_point - qom-tree =3D qemu.utils.qom:QOMTree.entry_point - qom-fuse =3D qemu.utils.qom_fuse:QOMFuse.entry_point [fuse] - qemu-ga-client =3D qemu.utils.qemu_ga_client:main qmp-shell =3D qemu.qmp.qmp_shell:main aqmp-tui =3D qemu.qmp.aqmp_tui:main [tui] =20 @@ -79,19 +65,12 @@ python_version =3D 3.6 warn_unused_configs =3D True namespace_packages =3D True =20 -[mypy-qemu.utils.qom_fuse] -# fusepy has no type stubs: -allow_subclassing_any =3D True - [mypy-qemu.qmp.aqmp_tui] # urwid and urwid_readline have no type stubs: allow_subclassing_any =3D True =20 # The following missing import directives are because these libraries do n= ot # provide type stubs. Allow them on an as-needed basis for mypy. -[mypy-fuse] -ignore_missing_imports =3D True - [mypy-urwid] ignore_missing_imports =3D True =20 @@ -160,7 +139,6 @@ skip_missing_interpreters =3D true allowlist_externals =3D make deps =3D .[devel] - .[fuse] # Workaround to trigger tox venv rebuild .[tui] # Workaround to trigger tox venv rebuild commands =3D make check diff --git a/setup.py b/setup.py index 2014f81..cb9b9b6 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ -QEMU tooling installer script +QEMU QMP library installer script Copyright (c) 2020-2021 John Snow for Red Hat, Inc. """ =20 --=20 2.31.1