| Message ID | 20220513000609.197906-5-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests: run python tests under the build/tests/venv environment | expand |
On 5/13/22 02:06, John Snow wrote: > diff --git a/tests/Makefile.include b/tests/Makefile.include > index dbbf1ba535b..dfb678d379f 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -109,11 +109,11 @@ $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(SRC_PATH)/python/setup.cfg > $(PYTHON) -m venv $@, \ > VENV, $@) > $(call quiet-command, \ > - $(TESTS_PYTHON) -m pip -q install \ > + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check install \ > -e "$(SRC_PATH)/python/", PIP, "$(SRC_PATH)/python/") > $(call quiet-command, \ > - $(TESTS_PYTHON) -m pip -q install -r $(TESTS_VENV_REQ), \ > - PIP, $(TESTS_VENV_REQ)) > + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check install \ > + -r $(TESTS_VENV_REQ), PIP, $(TESTS_VENV_REQ)) > $(call quiet-command, touch $@) Really nitpicking but I would have placed this change before adding the second invocation of pip. :) Paolo
On Fri, May 13, 2022, 4:27 AM Paolo Bonzini <pbonzini@redhat.com> wrote: > On 5/13/22 02:06, John Snow wrote: > > diff --git a/tests/Makefile.include b/tests/Makefile.include > > index dbbf1ba535b..dfb678d379f 100644 > > --- a/tests/Makefile.include > > +++ b/tests/Makefile.include > > @@ -109,11 +109,11 @@ $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) > $(SRC_PATH)/python/setup.cfg > > $(PYTHON) -m venv $@, \ > > VENV, $@) > > $(call quiet-command, \ > > - $(TESTS_PYTHON) -m pip -q install \ > > + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check > install \ > > -e "$(SRC_PATH)/python/", PIP, "$(SRC_PATH)/python/") > > $(call quiet-command, \ > > - $(TESTS_PYTHON) -m pip -q install -r $(TESTS_VENV_REQ), \ > > - PIP, $(TESTS_VENV_REQ)) > > + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check > install \ > > + -r $(TESTS_VENV_REQ), PIP, $(TESTS_VENV_REQ)) > > $(call quiet-command, touch $@) > > Really nitpicking but I would have placed this change before adding the > second invocation of pip. :) > > Paolo > You're right. This RFC was a little disorganized, I wasn't sure I was going to keep any of this code just yet, so it missed a cleanup pass. (Forgive me, please!)
diff --git a/tests/Makefile.include b/tests/Makefile.include index dbbf1ba535b..dfb678d379f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -109,11 +109,11 @@ $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) $(SRC_PATH)/python/setup.cfg $(PYTHON) -m venv $@, \ VENV, $@) $(call quiet-command, \ - $(TESTS_PYTHON) -m pip -q install \ + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check install \ -e "$(SRC_PATH)/python/", PIP, "$(SRC_PATH)/python/") $(call quiet-command, \ - $(TESTS_PYTHON) -m pip -q install -r $(TESTS_VENV_REQ), \ - PIP, $(TESTS_VENV_REQ)) + $(TESTS_PYTHON) -m pip -q --disable-pip-version-check install \ + -r $(TESTS_VENV_REQ), PIP, $(TESTS_VENV_REQ)) $(call quiet-command, touch $@) $(TESTS_RESULTS_DIR):
Turn off the nag warning coaxing us to upgrade pip. It's not really that interesting to see in CI logs, and as long as nothing is broken -- nothing is broken. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)