[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/27] python: shut up "pip install" during "make check-minreqs"
From: |
John Snow |
Subject: |
[PATCH 01/27] python: shut up "pip install" during "make check-minreqs" |
Date: |
Wed, 10 May 2023 23:54:09 -0400 |
From: Paolo Bonzini <pbonzini@redhat.com>
"make check-minreqs" runs pip without the --disable-pip-version-check
option, which causes the obnoxious "A new release of pip available"
message.
Recent versions of pip also complain that some of the dependencies in
our virtual environment rely on "setup.py install" instead of providing
a pyproject.toml file; apparently it is deprecated to install them
directly from pip instead of letting the "wheel" package take care
of them. So, install "wheel" in the virtual environment.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/python/Makefile b/python/Makefile
index c5bd6ff83a..47560657d2 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -54,6 +54,7 @@ pipenv check-pipenv:
@echo "pipenv was dropped; try 'make check-minreqs' or 'make min-venv'"
@exit 1
+PIP_INSTALL = pip install --disable-pip-version-check
.PHONY: min-venv
min-venv: $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate
$(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg
tests/minreqs.txt
@@ -62,10 +63,12 @@ $(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; \
+ $(PIP_INSTALL) -r tests/minreqs.txt 1>/dev/null; \
echo "INSTALL -e qemu $(QEMU_MINVENV_DIR)"; \
- pip install -e . 1>/dev/null; \
+ $(PIP_INSTALL) -e . 1>/dev/null; \
)
@touch $(QEMU_MINVENV_DIR)
@@ -100,7 +103,7 @@ check-dev: dev-venv
.PHONY: develop
develop:
- pip3 install --disable-pip-version-check -e .[devel]
+ $(PIP_INSTALL) -e .[devel]
.PHONY: check
check:
--
2.40.0
- [PATCH 00/27] configure: create a python venv and ensure meson, sphinx, John Snow, 2023/05/10
- [PATCH 04/27] mkvenv: add better error message for missing pyexpat module, John Snow, 2023/05/10
- [PATCH 01/27] python: shut up "pip install" during "make check-minreqs",
John Snow <=
- [PATCH 03/27] python: add mkvenv.py, John Snow, 2023/05/10
- [PATCH 02/27] python: update pylint configuration, John Snow, 2023/05/10
- [PATCH 05/27] mkvenv: add nested venv workaround, John Snow, 2023/05/10
- [PATCH 06/27] mkvenv: add ensure subcommand, John Snow, 2023/05/10
- [PATCH 08/27] mkvenv: add console script entry point generation, John Snow, 2023/05/10
- [PATCH 07/27] mkvenv: add diagnose() method for ensure() failures, John Snow, 2023/05/10