From: John Snow Date: Thu, 26 Feb 2026 21:33:59 +0000 (-0500) Subject: python: drop avocado X-Git-Tag: v11.0.0-rc0~23^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ae1c7072615b3acece26b548ff1925c5e5e2ed;p=thirdparty%2Fqemu.git python: drop avocado Avocado-framework is no longer used for anything, so it can be removed. Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Message-ID: <20260226213400.1254014-4-jsnow@redhat.com> Signed-off-by: John Snow --- diff --git a/python/README.rst b/python/README.rst index ec5cb5e971b..e34d1a1c7b1 100644 --- a/python/README.rst +++ b/python/README.rst @@ -108,8 +108,6 @@ Files in this directory - ``qemu/`` Python 'qemu' namespace package source directory. - ``tests/`` Python package tests directory. -- ``avocado.cfg`` Configuration for the Avocado test-runner. - Used by ``make check`` et al. - ``Makefile`` provides some common testing/installation invocations. Try ``make help`` to see available targets. - ``MANIFEST.in`` is read by python setuptools, it specifies additional files diff --git a/python/avocado.cfg b/python/avocado.cfg deleted file mode 100644 index a4604200594..00000000000 --- a/python/avocado.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[run] -test_runner = nrunner - -[simpletests] -# Don't show stdout/stderr in the test *summary* -status.failure_fields = ['status'] - -[job] -# Don't show the full debug.log output; only select stdout/stderr. -output.testlogs.logfiles = ['stdout', 'stderr'] - -# Show full stdout/stderr only on tests that FAIL -output.testlogs.statuses = ['FAIL'] diff --git a/python/setup.cfg b/python/setup.cfg index 03344526730..e5bf498f0e1 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -35,7 +35,6 @@ install_requires = [options.extras_require] # Remember to update tests/minreqs.txt if changing anything below: devel = - avocado-framework >= 90.0 distlib >= 0.3.6 flake8 >= 5.0.4 fusepy >= 2.0.4 diff --git a/python/tests/flake8.sh b/python/tests/flake8.sh deleted file mode 100755 index e0136996453..00000000000 --- a/python/tests/flake8.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e -python3 -m flake8 qemu/ -python3 -m flake8 scripts/ diff --git a/python/tests/iotests-mypy.sh b/python/tests/iotests-mypy.sh deleted file mode 100755 index ee764708199..00000000000 --- a/python/tests/iotests-mypy.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -cd ../tests/qemu-iotests/ -python3 -m linters --mypy diff --git a/python/tests/iotests-pylint.sh b/python/tests/iotests-pylint.sh deleted file mode 100755 index 33c5ae900a5..00000000000 --- a/python/tests/iotests-pylint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -e - -cd ../tests/qemu-iotests/ -# See commit message for environment variable explainer. -SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m linters --pylint diff --git a/python/tests/isort.sh b/python/tests/isort.sh deleted file mode 100755 index 66c2f7df0fd..00000000000 --- a/python/tests/isort.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e -python3 -m isort -c qemu/ -python3 -m isort -c scripts/ diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 19912027076..05c3bdb89f8 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -31,7 +31,6 @@ distlib==0.3.6 fusepy==2.0.4 # Test-runners, utilities, etc. -avocado-framework==90.0 pytest==6.0.2 # Linters diff --git a/python/tests/mypy.sh b/python/tests/mypy.sh deleted file mode 100755 index a33a3f58ab3..00000000000 --- a/python/tests/mypy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e -python3 -m mypy -p qemu -python3 -m mypy scripts/ diff --git a/python/tests/pylint.sh b/python/tests/pylint.sh deleted file mode 100755 index 2b68da90df7..00000000000 --- a/python/tests/pylint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -# See commit message for environment variable explainer. -SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m pylint qemu/ -SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m pylint scripts/ diff --git a/python/tests/qapi-flake8.sh b/python/tests/qapi-flake8.sh deleted file mode 100755 index c69f9ea2e00..00000000000 --- a/python/tests/qapi-flake8.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e -# SPDX-License-Identifier: GPL-2.0-or-later - -python3 -m flake8 ../scripts/qapi/ \ - ../docs/sphinx/qapidoc.py \ - ../docs/sphinx/qapi_domain.py diff --git a/python/tests/qapi-isort.sh b/python/tests/qapi-isort.sh deleted file mode 100755 index 067c16d5d94..00000000000 --- a/python/tests/qapi-isort.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e -# SPDX-License-Identifier: GPL-2.0-or-later - -python3 -m isort --sp . -c ../scripts/qapi/ -# Force isort to recognize "compat" as a local module and not third-party -python3 -m isort --sp . -c -p compat \ - ../docs/sphinx/qapi_domain.py \ - ../docs/sphinx/qapidoc.py diff --git a/python/tests/qapi-mypy.sh b/python/tests/qapi-mypy.sh deleted file mode 100755 index 363dbaf8c06..00000000000 --- a/python/tests/qapi-mypy.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -# SPDX-License-Identifier: GPL-2.0-or-later - -python3 -m mypy ../scripts/qapi diff --git a/python/tests/qapi-pylint.sh b/python/tests/qapi-pylint.sh deleted file mode 100755 index 8767d9d2a2d..00000000000 --- a/python/tests/qapi-pylint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -e -# SPDX-License-Identifier: GPL-2.0-or-later - -SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m pylint \ - --rcfile=../scripts/qapi/pylintrc \ - ../scripts/qapi/ \ - ../docs/sphinx/qapidoc.py \ - ../docs/sphinx/qapi_domain.py