summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorJohn Snow2022-02-04 23:18:04 +0100
committerJohn Snow2022-02-23 23:07:26 +0100
commit43a1119ef132ce23624046babbd08d9d0708dc46 (patch)
treee6d48dacb0f1ad1c3fb919a6acb2deb077e7fa9e /python
parentPython: add setuptools v60.0 workaround (diff)
downloadqemu-43a1119ef132ce23624046babbd08d9d0708dc46.tar.gz
qemu-43a1119ef132ce23624046babbd08d9d0708dc46.tar.xz
qemu-43a1119ef132ce23624046babbd08d9d0708dc46.zip
Revert "python: pin setuptools below v60.0.0"
This reverts commit 1e4d8b31be35e54b6429fea54f5ecaa0083f91e7. Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 20220204221804.2047468-3-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'python')
-rw-r--r--python/Makefile2
-rw-r--r--python/setup.cfg1
2 files changed, 0 insertions, 3 deletions
diff --git a/python/Makefile b/python/Makefile
index 949c472624..3334311362 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -68,8 +68,6 @@ $(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate: setup.cfg
echo "ACTIVATE $(QEMU_VENV_DIR)"; \
. $(QEMU_VENV_DIR)/bin/activate; \
echo "INSTALL qemu[devel] $(QEMU_VENV_DIR)"; \
- pip install --disable-pip-version-check \
- "setuptools<60.0.0" 1>/dev/null; \
make develop 1>/dev/null; \
)
@touch $(QEMU_VENV_DIR)
diff --git a/python/setup.cfg b/python/setup.cfg
index 9821db9880..241f243e8b 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -167,7 +167,6 @@ deps =
.[devel]
.[fuse] # Workaround to trigger tox venv rebuild
.[tui] # Workaround to trigger tox venv rebuild
- setuptools < 60 # Workaround, please see commit msg.
commands =
make check