python: drop avocado

Avocado-framework is no longer used for anything, so it can be removed.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20260226213400.1254014-4-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>

diff --git a/python/README.rst b/python/README.rst
index ec5cb5e971bbc33de921ba6e39294e2dd013b54a..e34d1a1c7b1cf1e1012a7857a66079523bbab034 100644 (file)
--- 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 (file)
index a460420..0000000
--- 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 033445267301da7219ac6db01c489efed1743f34..e5bf498f0e1e3ebc95e352a2234beb1629b7ffd2 100644 (file)
--- 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 (executable)
index e013699..0000000
--- 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 (executable)
index ee76470..0000000
--- 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 (executable)
index 33c5ae9..0000000
--- 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 (executable)
index 66c2f7d..0000000
--- 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 199120270761491f8d3cc810b047dc904ed53d6e..05c3bdb89f805fdc73cd942c1d957cbb04c26a7c 100644 (file)
--- 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 (executable)
index a33a3f5..0000000
--- 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 (executable)
index 2b68da9..0000000
--- 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 (executable)
index c69f9ea..0000000
--- 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 (executable)
index 067c16d..0000000
--- 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 (executable)
index 363dbaf..0000000
--- 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 (executable)
index 8767d9d..0000000
--- 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