Revert "python: pin setuptools below v60.0.0"

This reverts commit 1e4d8b31be35e54b6429fea54f5ecaa0083f91e7.

Signed-off-by: John Snow <[email protected]>
Message-id: 20220204221804.2047468[email protected]
Signed-off-by: John Snow <[email protected]>

diff --git a/python/Makefile b/python/Makefile
index 949c472624a38c3ebf1ededed094a544c2227ddf..3334311362573a8b9f39efb12fed6acf65c96b8a 100644 (file)
--- 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 9821db9880a4791fc7ab6f9c0eee27a3b9f2305c..241f243e8b94417f9b032c41576b3fe84b7aae9d 100644 (file)
--- 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