Failed in applying to current master (
apply log)
MAINTAINERS | 2 +-
docs/conf.py | 2 +-
docs/sphinx/qapidoc.py | 6 +-
meson.build | 28 +++++-----
{scripts => python/qemu}/qapi/__init__.py | 0
{scripts => python/qemu}/qapi/commands.py | 4 +-
{scripts => python/qemu}/qapi/common.py | 12 +++-
{scripts => python/qemu}/qapi/error.py | 0
{scripts => python/qemu}/qapi/events.py | 4 +-
{scripts => python/qemu}/qapi/expr.py | 3 +
{scripts => python/qemu}/qapi/gen.py | 4 +-
{scripts => python/qemu}/qapi/introspect.py | 3 +
{scripts => python/qemu}/qapi/main.py | 2 +
{scripts => python/qemu}/qapi/parser.py | 9 ++-
{scripts => python/qemu}/qapi/schema.py | 2 +-
{scripts => python/qemu}/qapi/source.py | 2 +
{scripts => python/qemu}/qapi/types.py | 2 +
{scripts => python/qemu}/qapi/visit.py | 3 +
python/setup.cfg | 22 ++++----
scripts/qapi-gen.py | 4 +-
scripts/qapi/.flake8 | 3 -
scripts/qapi/.isort.cfg | 7 ---
scripts/qapi/mypy.ini | 4 --
scripts/qapi/pylintrc | 61 ---------------------
tests/qapi-schema/meson.build | 2 +-
tests/qapi-schema/test-qapi.py | 4 +-
26 files changed, 78 insertions(+), 117 deletions(-)
rename {scripts => python/qemu}/qapi/__init__.py (100%)
rename {scripts => python/qemu}/qapi/commands.py (99%)
rename {scripts => python/qemu}/qapi/common.py (96%)
rename {scripts => python/qemu}/qapi/error.py (100%)
rename {scripts => python/qemu}/qapi/events.py (98%)
rename {scripts => python/qemu}/qapi/expr.py (99%)
rename {scripts => python/qemu}/qapi/gen.py (99%)
rename {scripts => python/qemu}/qapi/introspect.py (99%)
rename {scripts => python/qemu}/qapi/main.py (98%)
rename {scripts => python/qemu}/qapi/parser.py (99%)
rename {scripts => python/qemu}/qapi/schema.py (99%)
rename {scripts => python/qemu}/qapi/source.py (98%)
rename {scripts => python/qemu}/qapi/types.py (99%)
rename {scripts => python/qemu}/qapi/visit.py (99%)
delete mode 100644 scripts/qapi/.flake8
delete mode 100644 scripts/qapi/.isort.cfg
delete mode 100644 scripts/qapi/mypy.ini
delete mode 100644 scripts/qapi/pylintrc