From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 41/44] python: add Makefile for some common tasks
Date: Thu, 27 May 2021 22:32:17 -0400 [thread overview]
Message-ID: <20210528023220.417057-42-jsnow@redhat.com> (raw)
In-Reply-To: <20210528023220.417057-1-jsnow@redhat.com>
Add "make venv" to create the pipenv-managed virtual environment that
contains our explicitly pinned dependencies.
Add "make check" to run the python linters [in the host execution
environment].
Add "make venv-check" which combines the above two: create/update the
venv, then run the linters in that explicitly managed environment.
Add "make develop" which canonizes the runes needed to get both the
linting pre-requisites (the "[devel]" part), and the editable
live-install (the "-e" part) of these python libraries.
make clean: delete miscellaneous python packaging output possibly
created by pipenv, pip, or other python packaging utilities
make distclean: delete the above, the .venv, and the editable "qemu"
package forwarder (qemu.egg-info) if there is one.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Message-id: 20210527211715.394144-29-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/PACKAGE.rst | 6 ++++++
python/README.rst | 6 ++++++
python/Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+)
create mode 100644 python/Makefile
diff --git a/python/PACKAGE.rst b/python/PACKAGE.rst
index 05ea7789fc1..b0b86cc4c31 100644
--- a/python/PACKAGE.rst
+++ b/python/PACKAGE.rst
@@ -35,3 +35,9 @@ the report.
Optional packages necessary for running code quality analysis for this
package can be installed with the optional dependency group "devel":
``pip install qemu[devel]``.
+
+``make develop`` can be used to install this package in editable mode
+(to the current environment) *and* bring in testing dependencies in one
+command.
+
+``make check`` can be used to run the available tests.
diff --git a/python/README.rst b/python/README.rst
index 6bd2c6b3547..dcf993819db 100644
--- a/python/README.rst
+++ b/python/README.rst
@@ -28,6 +28,9 @@ Installing ".[devel]" instead of "." will additionally pull in required
packages for testing this package. They are not runtime requirements,
and are not needed to simply use these libraries.
+Running ``make develop`` will pull in all testing dependencies and
+install QEMU in editable mode to the current environment.
+
See `Installing packages using pip and virtual environments
<https://packaging.python.org/guides/installing-using-pip-and-virtual-environments/>`_
for more information.
@@ -39,6 +42,9 @@ Files in this directory
- ``qemu/`` Python package source directory.
- ``tests/`` Python package tests directory.
- ``avocado.cfg`` Configuration for the Avocado test-runner.
+ Used by ``make check`` et al.
+- ``Makefile`` provides some common testing/installation invocations.
+ Try ``make help`` to see available targets.
- ``MANIFEST.in`` is read by python setuptools, it specifies additional files
that should be included by a source distribution.
- ``PACKAGE.rst`` is used as the README file that is visible on PyPI.org.
diff --git a/python/Makefile b/python/Makefile
new file mode 100644
index 00000000000..a9da1689558
--- /dev/null
+++ b/python/Makefile
@@ -0,0 +1,43 @@
+.PHONY: help venv venv-check check clean distclean develop
+
+help:
+ @echo "python packaging help:"
+ @echo ""
+ @echo "make venv: Create pipenv's virtual environment."
+ @echo " NOTE: Requires Python 3.6 and pipenv."
+ @echo " Will download packages from PyPI."
+ @echo " Hint: (On Fedora): 'sudo dnf install python36 pipenv'"
+ @echo ""
+ @echo "make venv-check: run linters using pipenv's virtual environment."
+ @echo " Hint: If you don't know which test to run, run this one!"
+ @echo ""
+ @echo "make develop: Install deps for 'make check', and"
+ @echo " the qemu libs in editable/development mode."
+ @echo ""
+ @echo "make check: run linters using the current environment."
+ @echo ""
+ @echo "make clean: remove package build output."
+ @echo ""
+ @echo "make distclean: remove venv files, qemu package forwarder,"
+ @echo " built distribution files, and everything"
+ @echo " from 'make clean'."
+
+venv: .venv
+.venv: Pipfile.lock
+ @PIPENV_VENV_IN_PROJECT=1 pipenv sync --dev --keep-outdated
+ @touch .venv
+
+venv-check: venv
+ @pipenv run make check
+
+develop:
+ pip3 install -e .[devel]
+
+check:
+ @avocado --config avocado.cfg run tests/
+
+clean:
+ python3 setup.py clean --all
+
+distclean: clean
+ rm -rf qemu.egg-info/ .venv/ dist/
--
2.31.1
next prev parent reply other threads:[~2021-05-28 2:46 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 2:31 [PULL 00/44] Python patches John Snow
2021-05-28 2:31 ` [PULL 01/44] Python: expose QEMUMachine's temporary directory John Snow
2021-05-28 2:31 ` [PULL 02/44] tests/acceptance/virtiofs_submounts.py: add missing accel tag John Snow
2021-05-28 2:31 ` [PULL 03/44] tests/acceptance/virtiofs_submounts.py: evaluate string not length John Snow
2021-05-28 2:31 ` [PULL 04/44] Python: add utility function for retrieving port redirection John Snow
2021-05-28 2:31 ` [PULL 05/44] Acceptance Tests: move useful ssh methods to base class John Snow
2021-05-28 2:31 ` [PULL 06/44] Acceptance Tests: add port redirection for ssh by default John Snow
2021-05-28 2:31 ` [PULL 07/44] Acceptance Tests: make username/password configurable John Snow
2021-05-28 2:31 ` [PULL 08/44] Acceptance Tests: set up SSH connection by default after boot for LinuxTest John Snow
2021-05-28 2:31 ` [PULL 09/44] tests/acceptance/virtiofs_submounts.py: remove launch_vm() John Snow
2021-05-28 2:31 ` [PULL 10/44] Acceptance Tests: add basic documentation on LinuxTest base class John Snow
2021-05-28 2:31 ` [PULL 11/44] Acceptance Tests: introduce CPU hotplug test John Snow
2021-05-28 2:31 ` [PULL 12/44] tests/acceptance/virtiofs_submounts.py: fix setup of SSH pubkey John Snow
2021-05-28 2:31 ` [PULL 13/44] acceptance tests: bump Avocado version to 88.1 John Snow
2021-05-28 2:31 ` [PULL 14/44] python/console_socket: avoid one-letter variable John Snow
2021-05-28 2:31 ` [PULL 15/44] python/machine: use subprocess.DEVNULL instead of open(os.path.devnull) John Snow
2021-05-28 2:31 ` [PULL 16/44] python/machine: use subprocess.run instead of subprocess.Popen John Snow
2021-05-28 2:31 ` [PULL 17/44] python/console_socket: Add a pylint ignore John Snow
2021-05-28 2:31 ` [PULL 18/44] python/machine: Disable pylint warning for open() in _pre_launch John Snow
2021-05-28 2:31 ` [PULL 19/44] python/machine: disable warning for Popen in _launch() John Snow
2021-05-28 2:31 ` [PULL 20/44] python/machine: Trim line length to below 80 chars John Snow
2021-05-28 2:31 ` [PULL 21/44] iotests/297: add --namespace-packages to mypy arguments John Snow
2021-05-28 2:31 ` [PULL 22/44] python: create qemu packages John Snow
2021-05-28 2:31 ` [PULL 23/44] python: add qemu package installer John Snow
2021-05-28 2:32 ` [PULL 24/44] python: add VERSION file John Snow
2021-05-28 2:32 ` [PULL 25/44] python: add directory structure README.rst files John Snow
2021-05-28 2:32 ` [PULL 26/44] python: add MANIFEST.in John Snow
2021-05-28 2:32 ` [PULL 27/44] python: Add pipenv support John Snow
2021-05-28 2:32 ` [PULL 28/44] python: add pylint import exceptions John Snow
2021-05-28 2:32 ` [PULL 29/44] python: move pylintrc into setup.cfg John Snow
2021-05-28 2:32 ` [PULL 30/44] python: add pylint to pipenv John Snow
2021-05-28 2:32 ` [PULL 31/44] python: move flake8 config to setup.cfg John Snow
2021-05-28 2:32 ` [PULL 32/44] python: add excluded dirs to flake8 config John Snow
2021-05-28 2:32 ` [PULL 33/44] python: Add flake8 to pipenv John Snow
2021-05-28 2:32 ` [PULL 34/44] python: move mypy.ini into setup.cfg John Snow
2021-05-28 2:32 ` [PULL 35/44] python: add mypy to pipenv John Snow
2021-05-28 2:32 ` [PULL 36/44] python: move .isort.cfg into setup.cfg John Snow
2021-05-28 2:32 ` [PULL 37/44] python/qemu: add isort to pipenv John Snow
2021-05-28 2:32 ` [PULL 38/44] python/qemu: add qemu package itself " John Snow
2021-05-28 2:32 ` [PULL 39/44] python: add devel package requirements to setuptools John Snow
2021-05-28 2:32 ` [PULL 40/44] python: add avocado-framework and tests John Snow
2021-05-28 2:32 ` John Snow [this message]
2021-05-28 2:32 ` [PULL 42/44] python: add .gitignore John Snow
2021-05-28 2:32 ` [PULL 43/44] python: add tox support John Snow
2021-05-28 2:32 ` [PULL 44/44] gitlab: add python linters to CI John Snow
2021-05-30 19:09 ` [PULL 00/44] Python patches Peter Maydell
2021-05-30 19:22 ` John Snow
2021-05-31 8:10 ` Philippe Mathieu-Daudé
2021-06-01 10:36 ` Peter Maydell
2021-06-01 23:48 ` John Snow
2021-06-01 15:45 ` [PATCH 0/1] VM tests: account for changes in qemu.utils.get_info_usernet_hostfwd_port() Cleber Rosa
2021-06-01 15:45 ` [PATCH 1/1] " Cleber Rosa
2021-06-01 17:36 ` Willian Rampazzo
2021-06-01 17:56 ` John Snow
2021-06-01 18:07 ` Willian Rampazzo
2021-06-01 18:21 ` Philippe Mathieu-Daudé
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=20210528023220.417057-42-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@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).