aboutsummaryrefslogtreecommitdiff
path: root/python/tests
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-02-24 12:48:14 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-02-24 12:48:14 +0000
commitfa435db8ce1dff3b15e3f59a12f55f7b3a347b08 (patch)
tree0637100e8a0eb8e9f6c03ec95688adccd018be3a /python/tests
parent4aa2e497a98bafe962e72997f67a369e4b52d9c1 (diff)
parent89d38c74f4b69a93696392b55a9fee573055d78b (diff)
downloadqemu-fa435db8ce1dff3b15e3f59a12f55f7b3a347b08.zip
qemu-fa435db8ce1dff3b15e3f59a12f55f7b3a347b08.tar.gz
qemu-fa435db8ce1dff3b15e3f59a12f55f7b3a347b08.tar.bz2
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Python patches New functionality in qmp-shell from Dan, and some packaging fixes. # gpg: Signature made Wed 23 Feb 2022 22:08:35 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: MAINTAINERS: python - remove ehabkost and add bleal Revert "python: pin setuptools below v60.0.0" Python: add setuptools v60.0 workaround Python: discourage direct setup.py install python: support recording QMP session to a file python: introduce qmp-shell-wrap convenience tool Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/tests')
-rwxr-xr-xpython/tests/iotests-pylint.sh3
-rwxr-xr-xpython/tests/pylint.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/python/tests/iotests-pylint.sh b/python/tests/iotests-pylint.sh
index 4cae034..33c5ae9 100755
--- a/python/tests/iotests-pylint.sh
+++ b/python/tests/iotests-pylint.sh
@@ -1,4 +1,5 @@
#!/bin/sh -e
cd ../tests/qemu-iotests/
-python3 -m linters --pylint
+# See commit message for environment variable explainer.
+SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m linters --pylint
diff --git a/python/tests/pylint.sh b/python/tests/pylint.sh
index 4b10b34..03d6470 100755
--- a/python/tests/pylint.sh
+++ b/python/tests/pylint.sh
@@ -1,2 +1,3 @@
#!/bin/sh -e
-python3 -m pylint qemu/
+# See commit message for environment variable explainer.
+SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m pylint qemu/