diff options
| author | Peter Maydell | 2022-01-22 13:03:22 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-01-22 13:03:22 +0100 |
| commit | aeb0ae95b7f18c66158792641cb6ba0cde5789ab (patch) | |
| tree | 295ec2800a9340195c95f52c94520aa479f89ce0 /python/setup.cfg | |
| parent | Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20220... (diff) | |
| parent | scripts/render-block-graph: switch to AQMP (diff) | |
| download | qemu-aeb0ae95b7f18c66158792641cb6ba0cde5789ab.tar.gz qemu-aeb0ae95b7f18c66158792641cb6ba0cde5789ab.tar.xz qemu-aeb0ae95b7f18c66158792641cb6ba0cde5789ab.zip | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Python patches
A few fixes to the Python CI tests, a few fixes to the (async) QMP
library, and a set of patches that begin to shift us towards using the
new qmp lib.
# gpg: Signature made Sat 22 Jan 2022 00:07:58 GMT
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jsnow-gitlab/tags/python-pull-request:
scripts/render-block-graph: switch to AQMP
scripts/cpu-x86-uarch-abi: switch to AQMP
scripts/cpu-x86-uarch-abi: fix CLI parsing
python: move qmp-shell under the AQMP package
python: move qmp utilities to python/qemu/utils
python/qmp: switch qmp-shell to AQMP
python/qmp: switch qom tools to AQMP
python/qmp: switch qemu-ga-client to AQMP
python/qemu-ga-client: don't use deprecated CLI syntax in usage comment
python/aqmp: rename AQMPError to QMPError
python/aqmp: add SocketAddrT to package root
python/aqmp: copy type definitions from qmp
python/aqmp: handle asyncio.TimeoutError on execute()
python/aqmp: add __del__ method to legacy interface
python/aqmp: fix docstring typo
python: use avocado's "new" runner
python: pin setuptools below v60.0.0
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/setup.cfg')
| -rw-r--r-- | python/setup.cfg | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/python/setup.cfg b/python/setup.cfg index 417e937839..3fb18f845d 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -60,14 +60,14 @@ tui = [options.entry_points] console_scripts = - qom = qemu.qmp.qom:main - qom-set = qemu.qmp.qom:QOMSet.entry_point - qom-get = qemu.qmp.qom:QOMGet.entry_point - qom-list = qemu.qmp.qom:QOMList.entry_point - qom-tree = qemu.qmp.qom:QOMTree.entry_point - qom-fuse = qemu.qmp.qom_fuse:QOMFuse.entry_point [fuse] - qemu-ga-client = qemu.qmp.qemu_ga_client:main - qmp-shell = qemu.qmp.qmp_shell:main + qom = qemu.utils.qom:main + qom-set = qemu.utils.qom:QOMSet.entry_point + qom-get = qemu.utils.qom:QOMGet.entry_point + qom-list = qemu.utils.qom:QOMList.entry_point + qom-tree = qemu.utils.qom:QOMTree.entry_point + qom-fuse = qemu.utils.qom_fuse:QOMFuse.entry_point [fuse] + qemu-ga-client = qemu.utils.qemu_ga_client:main + qmp-shell = qemu.aqmp.qmp_shell:main aqmp-tui = qemu.aqmp.aqmp_tui:main [tui] [flake8] @@ -80,7 +80,7 @@ python_version = 3.6 warn_unused_configs = True namespace_packages = True -[mypy-qemu.qmp.qom_fuse] +[mypy-qemu.utils.qom_fuse] # fusepy has no type stubs: allow_subclassing_any = True @@ -163,6 +163,7 @@ deps = .[devel] .[fuse] # Workaround to trigger tox venv rebuild .[tui] # Workaround to trigger tox venv rebuild + setuptools < 60 # Workaround, please see commit msg. commands = make check |