1
0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-09 04:27:12 +00:00
qemu/tests/vm
Paolo Bonzini e8e4298fea tests: Use separate virtual environment for avocado
This reverts commits eea2d14117 ("Makefile: remove $(TESTS_PYTHON)",
2023-05-26) and 9c6692db55 ("tests: Use configure-provided pyvenv for
tests", 2023-05-18).

Right now, there is a conflict between wanting a ">=" constraint when
using a distro-provided package and wanting a "==" constraint when
installing Avocado from PyPI; this would provide the best of both worlds
in terms of resiliency for both distros that have required packages and
distros that don't.

The conflict is visible also for meson, where we would like to install
the latest 0.63.x version but also accept a distro 1.1.x version.
But it is worse for avocado, for two reasons:

1) we cannot use an "==" constraint to install avocado if the venv
includes a system avocado.  The distro will package plugins that have
"==" constraints on the version that is included in the distro, and, using
"pip install avocado==88.1" on a venv that includes system packages will
result in this error:

   ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
   avocado-framework-plugin-varianter-yaml-to-mux 98.0 requires avocado-framework==98.0, but you have avocado-framework 88.1 which is incompatible.
   avocado-framework-plugin-result-html 98.0 requires avocado-framework==98.0, but you have avocado-framework 88.1 which is incompatible.
   make[1]: Leaving directory '/home/berrange/src/virt/qemu/build'

2) we cannot use ">=" either if the venv does _not_ include a system
avocado, because that would result in the installation of v101.0 which
is the one we've just reverted.

So the idea is to encode the dependencies as an (acceptable, locked)
tuple, like this hypothetical TOML that would be committed inside
python/ and used by mkvenv.py:

  [meson]
  meson = { minimum = "0.63.0", install = "0.63.3", canary = "meson" }

  [docs]
  # 6.0 drops support for Python 3.7
  sphinx = { minimum = "1.6", install = "<6.0", canary = "sphinx-build" }
  sphinx_rtd_theme = { minimum = "0.5" }

  [avocado]
  avocado-framework = { minimum = "88.1", install = "88.1", canary = "avocado" }

Once this is implemented, it would also be possible to install avocado in
pyvenv/ using "mkvenv.py ensure", thus using the distro package on Fedora
and CentOS Stream (the only distros where it's available).  But until
this is implemented, keep avocado in a separate venv.  There is still the
benefit of using a single python for meson custom_targets and for sphinx.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2023-06-06 16:29:53 +02:00
..
aarch64vm.py python: create qemu packages 2021-06-01 16:21:21 -04:00
basevm.py tests/vm: Update get_default_jobs() to work on non-x86_64 non-KVM hosts 2023-01-09 13:50:13 +01:00
centos tests/vm: Remove docker cross-compile test from CentOS VM 2022-07-18 20:24:36 +02:00
centos-8-aarch64.ks tests/vm: Added a new script for centos.aarch64. 2020-07-11 15:52:59 +01:00
centos.aarch64 lcitool: drop perl from QEMU project/dependencies 2023-02-02 10:44:23 +00:00
conf_example_aarch64.yml tests/vm: Added configuration file support 2020-07-11 15:52:59 +01:00
conf_example_x86.yml tests/vm: Added configuration file support 2020-07-11 15:52:59 +01:00
freebsd tests/vm/freebsd: Update to FreeBSD 13.2 2023-04-20 11:28:16 +02:00
haiku.x86_64 tests/vm/haiku.x86_64: Update the Haiku VM to Beta 4 2023-01-18 12:27:21 +01:00
Makefile.include tests: Use separate virtual environment for avocado 2023-06-06 16:29:53 +02:00
netbsd tests/vm: add py310-expat to NetBSD 2023-05-18 08:53:51 +02:00
openbsd tests/vm: custom openbsd partitioning to increase /home space 2023-03-22 15:08:22 +00:00
README docs: Add docs/devel/testing.rst 2018-02-08 09:23:07 +08:00
ubuntu.aarch64 tests/vm: upgrade Ubuntu 18.04 VM to 20.04 2022-07-18 20:24:36 +02:00
ubuntuvm.py tests/vm: Add common Ubuntu python module 2020-07-11 15:52:59 +01:00

See docs/devel/testing.rst for help.