From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Willian Rampazzo" <willianr@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PATCH v3 11/15] python: add 'make check-dev' invocation
Date: Wed, 30 Jun 2021 11:57:26 -0300 [thread overview]
Message-ID: <8640e641-82b5-247c-cb86-a326295b0fa0@redhat.com> (raw)
In-Reply-To: <20210629214323.1329806-12-jsnow@redhat.com>
On 6/29/21 6:43 PM, John Snow wrote:
> This is a *third* way to run the Python tests. Unlike the first two
> (check-pipenv, check-tox), this version does not require any specific
> interpreter version -- making it a lot easier to tell people to run it
> as a quick smoketest prior to submission to GitLab CI.
>
> Summary:
>
> Checked via GitLab CI:
> - check-pipenv: tests our oldest python & dependencies
> - check-tox: tests newest dependencies on all non-EOL python versions
> Executed only incidentally:
> - check-dev: tests newest dependencies on whichever python version
>
> ('make check' does not set up any environment at all, it just runs the
> tests in your current environment. All four invocations perform the
> exact same tests, just in different execution environments.)
>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> python/Makefile | 35 +++++++++++++++++++++++++++++++++--
> 1 file changed, 33 insertions(+), 2 deletions(-)
Tested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
It was tested as I mentioned on patch 10.
>
> diff --git a/python/Makefile b/python/Makefile
> index d34c4e35d9..8f8e1999c0 100644
> --- a/python/Makefile
> +++ b/python/Makefile
> @@ -1,3 +1,5 @@
> +QEMU_VENV_DIR=.dev-venv
> +
> .PHONY: help
> help:
> @echo "python packaging help:"
> @@ -14,6 +16,11 @@ help:
> @echo " Requires: Python 3.6 - 3.10, and tox."
> @echo " Hint (Fedora): 'sudo dnf install python3-tox python3.10'"
> @echo ""
> + @echo "make check-dev:"
> + @echo " Run tests in a venv against your default python3 version."
> + @echo " These tests use the newest dependencies."
> + @echo " Requires: Python 3.x"
> + @echo ""
> @echo "make develop: Install deps for 'make check', and"
> @echo " the qemu libs in editable/development mode."
> @echo ""
> @@ -22,6 +29,9 @@ help:
> @echo "make pipenv"
> @echo " Creates pipenv's virtual environment (.venv)"
> @echo ""
> + @echo "make dev-venv"
> + @echo " Creates a simple venv for check-dev. ($(QEMU_VENV_DIR))"
> + @echo ""
> @echo "make clean: remove package build output."
> @echo ""
> @echo "make distclean: remove venv files, qemu package forwarder,"
> @@ -38,9 +48,30 @@ pipenv: .venv
> check-pipenv: pipenv
> @pipenv run make check
>
> +.PHONY: dev-venv
> +dev-venv: $(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate
> +$(QEMU_VENV_DIR) $(QEMU_VENV_DIR)/bin/activate: setup.cfg
> + @echo "VENV $(QEMU_VENV_DIR)"
> + @python3 -m venv $(QEMU_VENV_DIR)
> + @( \
> + echo "ACTIVATE $(QEMU_VENV_DIR)"; \
> + . $(QEMU_VENV_DIR)/bin/activate; \
> + echo "INSTALL qemu[devel] $(QEMU_VENV_DIR)"; \
> + make develop 1>/dev/null; \
> + )
> + @touch $(QEMU_VENV_DIR)
> +
> +.PHONY: check-dev
> +check-dev: dev-venv
> + @( \
> + echo "ACTIVATE $(QEMU_VENV_DIR)"; \
> + . $(QEMU_VENV_DIR)/bin/activate; \
> + make check; \
> + )
> +
> .PHONY: develop
> develop:
> - pip3 install -e .[devel]
> + pip3 install --disable-pip-version-check -e .[devel]
>
> .PHONY: check
> check:
> @@ -56,4 +87,4 @@ clean:
>
> .PHONY: distclean
> distclean: clean
> - rm -rf qemu.egg-info/ .venv/ .tox/ dist/
> + rm -rf qemu.egg-info/ .venv/ .tox/ $(QEMU_VENV_DIR) dist/
next prev parent reply other threads:[~2021-06-30 14:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 21:43 [PATCH v3 00/15] Python: packaging cleanups John Snow
2021-06-29 21:43 ` [PATCH v3 01/15] python/qom: Do not use 'err' name at module scope John Snow
2021-06-30 14:35 ` Wainer dos Santos Moschetta
2021-06-30 14:35 ` Willian Rampazzo
2021-06-29 21:43 ` [PATCH v3 02/15] python: expose typing information via PEP 561 John Snow
2021-06-29 21:43 ` [PATCH v3 03/15] python: Remove global pylint suppressions John Snow
2021-06-29 21:43 ` [PATCH v3 04/15] python: Re-lock pipenv at *oldest* supported versions John Snow
2021-06-29 21:43 ` [PATCH v3 05/15] python: README.rst touchups John Snow
2021-06-29 21:43 ` [PATCH v3 06/15] python: Add no-install usage instructions John Snow
2021-06-29 21:43 ` [PATCH v3 07/15] python: rename 'venv-check' target to 'check-pipenv' John Snow
2021-06-29 21:43 ` [PATCH v3 08/15] python: update help text for check-tox John Snow
2021-06-29 21:43 ` [PATCH v3 09/15] python: Fix .PHONY Make specifiers John Snow
2021-06-29 21:43 ` [PATCH v3 10/15] python: only check qemu/ subdir with flake8 John Snow
2021-06-30 14:36 ` Willian Rampazzo
2021-06-30 14:54 ` Wainer dos Santos Moschetta
2021-06-29 21:43 ` [PATCH v3 11/15] python: add 'make check-dev' invocation John Snow
2021-06-30 14:40 ` Willian Rampazzo
2021-06-30 14:58 ` John Snow
2021-06-30 15:02 ` Wainer dos Santos Moschetta
2021-06-30 15:32 ` Willian Rampazzo
2021-06-30 14:57 ` Wainer dos Santos Moschetta [this message]
2021-06-29 21:43 ` [PATCH v3 12/15] python: Update help text on 'make check', 'make develop' John Snow
2021-06-29 21:43 ` [PATCH v3 13/15] python: Update help text on 'make clean', 'make distclean' John Snow
2021-06-29 21:43 ` [PATCH v3 14/15] python: remove auto-generated pyproject.toml file John Snow
2021-06-29 21:43 ` [PATCH v3 15/15] python: Fix broken ReST docstrings John Snow
2021-06-30 14:43 ` Willian Rampazzo
2021-06-30 15:03 ` Wainer dos Santos Moschetta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8640e641-82b5-247c-cb86-a326295b0fa0@redhat.com \
--to=wainersm@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).