• Paolo Bonzini's avatar
    tests: Use separate virtual environment for avocado · e8e4298f
    Paolo Bonzini authored
    This reverts commits eea2d141 ("Makefile: remove $(TESTS_PYTHON)",
    2023-05-26) and 9c6692db
     ("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 = { minimum = "0.63.0", install = "0.63.3", canary = "meson" }
      # 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-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's avatarPaolo Bonzini <pbonzini@redhat.com>