[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/6] Revert "python: pin setuptools below v60.0.0"
From: |
John Snow |
Subject: |
[PULL 5/6] Revert "python: pin setuptools below v60.0.0" |
Date: |
Wed, 23 Feb 2022 17:08:59 -0500 |
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>
---
python/Makefile | 2 --
python/setup.cfg | 1 -
2 files changed, 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
--
2.34.1
- [PULL 0/6] Python patches, John Snow, 2022/02/23
- [PULL 2/6] python: support recording QMP session to a file, John Snow, 2022/02/23
- [PULL 1/6] python: introduce qmp-shell-wrap convenience tool, John Snow, 2022/02/23
- [PULL 6/6] MAINTAINERS: python - remove ehabkost and add bleal, John Snow, 2022/02/23
- [PULL 3/6] Python: discourage direct setup.py install, John Snow, 2022/02/23
- [PULL 4/6] Python: add setuptools v60.0 workaround, John Snow, 2022/02/23
- [PULL 5/6] Revert "python: pin setuptools below v60.0.0",
John Snow <=
- Re: [PULL 0/6] Python patches, Peter Maydell, 2022/02/25