[PATCH v4 1/4] python: pin 'wheel' version in minreqs test

John Snow posted 4 patches 3 days, 11 hours ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Thomas Huth <thuth@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>
[PATCH v4 1/4] python: pin 'wheel' version in minreqs test
Posted by John Snow 3 days, 11 hours ago
With recent python packaging ecosystem updates, the latest 'wheel' is no
longer compatible with older packages - and was somehow still compatible
with our Python 3.9 environment. Pin wheel to an older version (Version
based on Debian 11's available wheel package) to remove warnings during
the minreqs test.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 python/Makefile          | 2 --
 python/tests/minreqs.txt | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/Makefile b/python/Makefile
index 32aedce4137..b6c9cd1bce2 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -63,8 +63,6 @@ $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg tests/minreqs.tx
 	@(								\
 		echo "ACTIVATE $(QEMU_MINVENV_DIR)";			\
 		. $(QEMU_MINVENV_DIR)/bin/activate;			\
-		echo "INSTALL wheel $(QEMU_MINVENV_DIR)";               \
-		$(PIP_INSTALL) wheel 1>/dev/null;		               \
 		echo "INSTALL -r tests/minreqs.txt $(QEMU_MINVENV_DIR)";\
 		$(PIP_INSTALL) -r tests/minreqs.txt 1>/dev/null;	\
 		echo "INSTALL -e qemu $(QEMU_MINVENV_DIR)";		\
diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt
index 855b5129c94..38b17d17e14 100644
--- a/python/tests/minreqs.txt
+++ b/python/tests/minreqs.txt
@@ -16,6 +16,7 @@
 # installation of the QEMU package itself fails, failing to find
 # setuptools.
 setuptools<=70
+wheel==0.34.2
 
 # Dependencies for qapidoc/qapi_domain et al
 sphinx==3.4.3
-- 
2.53.0