On Mon, Jan 10, 2022 at 06:28:54PM -0500, John Snow wrote:
> In order to upload a QMP package to PyPI, I want to remove any scripts
> that I am not 100% confident I want to support upstream, beyond our
> castle walls.
>
> Move most of our QMP utilities into the utils package so we can split
> them out from the PyPI upload.
>
> Signed-off-by: John Snow <js...@redhat.com>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> ---
> python/qemu/{qmp => utils}/qemu_ga_client.py | 0
> python/qemu/{qmp => utils}/qom.py | 0
> python/qemu/{qmp => utils}/qom_common.py | 0
> python/qemu/{qmp => utils}/qom_fuse.py | 0
> python/setup.cfg | 16 ++++++++--------
> scripts/qmp/qemu-ga-client | 2 +-
> scripts/qmp/qom-fuse | 2 +-
> scripts/qmp/qom-get | 2 +-
> scripts/qmp/qom-list | 2 +-
> scripts/qmp/qom-set | 2 +-
> scripts/qmp/qom-tree | 2 +-
> 11 files changed, 14 insertions(+), 14 deletions(-)
> rename python/qemu/{qmp => utils}/qemu_ga_client.py (100%)
> rename python/qemu/{qmp => utils}/qom.py (100%)
> rename python/qemu/{qmp => utils}/qom_common.py (100%)
> rename python/qemu/{qmp => utils}/qom_fuse.py (100%)
>
> diff --git a/python/qemu/qmp/qemu_ga_client.py
> b/python/qemu/utils/qemu_ga_client.py
> similarity index 100%
> rename from python/qemu/qmp/qemu_ga_client.py
> rename to python/qemu/utils/qemu_ga_client.py
> diff --git a/python/qemu/qmp/qom.py b/python/qemu/utils/qom.py
> similarity index 100%
> rename from python/qemu/qmp/qom.py
> rename to python/qemu/utils/qom.py
> diff --git a/python/qemu/qmp/qom_common.py b/python/qemu/utils/qom_common.py
> similarity index 100%
> rename from python/qemu/qmp/qom_common.py
> rename to python/qemu/utils/qom_common.py
> diff --git a/python/qemu/qmp/qom_fuse.py b/python/qemu/utils/qom_fuse.py
> similarity index 100%
> rename from python/qemu/qmp/qom_fuse.py
> rename to python/qemu/utils/qom_fuse.py
> diff --git a/python/setup.cfg b/python/setup.cfg
> index 417e937839..78421411d2 100644
> --- a/python/setup.cfg
> +++ b/python/setup.cfg
> @@ -60,13 +60,13 @@ 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
> + 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.qmp.qmp_shell:main
> aqmp-tui = qemu.aqmp.aqmp_tui:main [tui]
>
> @@ -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
>
> diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
> index 102fd2cad9..56edd0234a 100755
> --- a/scripts/qmp/qemu-ga-client
> +++ b/scripts/qmp/qemu-ga-client
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp import qemu_ga_client
> +from qemu.utils import qemu_ga_client
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
> index a58c8ef979..d453807b27 100755
> --- a/scripts/qmp/qom-fuse
> +++ b/scripts/qmp/qom-fuse
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp.qom_fuse import QOMFuse
> +from qemu.utils.qom_fuse import QOMFuse
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
> index e4f3e0c013..04ebe052e8 100755
> --- a/scripts/qmp/qom-get
> +++ b/scripts/qmp/qom-get
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp.qom import QOMGet
> +from qemu.utils.qom import QOMGet
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
> index 7a071a54e1..853b85a8d3 100755
> --- a/scripts/qmp/qom-list
> +++ b/scripts/qmp/qom-list
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp.qom import QOMList
> +from qemu.utils.qom import QOMList
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
> index 9ca9e2ba10..06820feec4 100755
> --- a/scripts/qmp/qom-set
> +++ b/scripts/qmp/qom-set
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp.qom import QOMSet
> +from qemu.utils.qom import QOMSet
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
> index 7d0ccca3a4..760e172277 100755
> --- a/scripts/qmp/qom-tree
> +++ b/scripts/qmp/qom-tree
> @@ -4,7 +4,7 @@ import os
> import sys
>
> sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..',
> 'python'))
> -from qemu.qmp.qom import QOMTree
> +from qemu.utils.qom import QOMTree
>
>
> if __name__ == '__main__':
> --
> 2.31.1
Reviewed-by: Beraldo Leal <bl...@redhat.com>
--
Beraldo
