[PULL 00/14] Python, i386 changes for 2023-08-28

Paolo Bonzini posted 14 patches 1 year, 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230828103856.46031-1-pbonzini@redhat.com
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Ed Maste <emaste@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org>, Paolo Bonzini <pbonzini@redhat.com>, Ani Sinha <anisinha@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>
.gitlab-ci.d/buildtest.yml                         |   6 +-
.gitlab-ci.d/cirrus/freebsd-13.vars                |   2 +-
.gitlab-ci.d/cirrus/macos-12.vars                  |   2 +-
configure                                          |  31 +---
docs/devel/acpi-bits.rst                           |   6 +-
docs/devel/testing.rst                             |  14 +-
python/scripts/mkvenv.py                           | 201 +++++++++++++++++++--
python/scripts/vendor.py                           |   5 +-
python/setup.cfg                                   |   6 +
python/wheels/tomli-2.0.1-py3-none-any.whl         | Bin 0 -> 12757 bytes
pythondeps.toml                                    |  32 ++++
scripts/ci/org.centos/stream/8/x86_64/test-avocado |   4 +-
scripts/device-crash-test                          |   2 +-
target/i386/cpu.c                                  |   6 +-
target/i386/cpu.h                                  |   1 +
tests/Makefile.include                             |  19 +-
tests/docker/dockerfiles/centos8.docker            |   3 +-
.../dockerfiles/debian-all-test-cross.docker       |   7 +-
tests/docker/dockerfiles/debian-amd64-cross.docker |   6 +-
tests/docker/dockerfiles/debian-amd64.docker       |   4 +
tests/docker/dockerfiles/debian-arm64-cross.docker |   6 +-
tests/docker/dockerfiles/debian-armel-cross.docker |   6 +-
tests/docker/dockerfiles/debian-armhf-cross.docker |   6 +-
.../docker/dockerfiles/debian-hexagon-cross.docker |   6 +-
.../dockerfiles/debian-mips64el-cross.docker       |   6 +-
.../docker/dockerfiles/debian-mipsel-cross.docker  |   6 +-
.../docker/dockerfiles/debian-ppc64el-cross.docker |   6 +-
.../docker/dockerfiles/debian-riscv64-cross.docker |   2 +-
tests/docker/dockerfiles/debian-s390x-cross.docker |   6 +-
.../docker/dockerfiles/debian-tricore-cross.docker |   4 +-
tests/docker/dockerfiles/fedora-i386-cross.docker  |   1 +
tests/docker/dockerfiles/fedora-win32-cross.docker |   2 +-
tests/docker/dockerfiles/fedora-win64-cross.docker |   2 +-
tests/docker/dockerfiles/opensuse-leap.docker      |  22 +--
tests/docker/dockerfiles/ubuntu2004.docker         |   4 +-
tests/docker/dockerfiles/ubuntu2204.docker         |   1 +
tests/lcitool/libvirt-ci                           |   2 +-
tests/lcitool/mappings.yml                         |  28 ++-
tests/lcitool/projects/qemu.yml                    |   3 +-
tests/lcitool/targets/opensuse-leap-15.yml         |   4 +-
tests/requirements.txt                             |   6 -
tests/vm/Makefile.include                          |   2 +-
tests/vm/generated/freebsd.json                    |   1 +
43 files changed, 377 insertions(+), 112 deletions(-)
create mode 100644 python/wheels/tomli-2.0.1-py3-none-any.whl
create mode 100644 pythondeps.toml
delete mode 100644 tests/requirements.txt
[PULL 00/14] Python, i386 changes for 2023-08-28
Posted by Paolo Bonzini 1 year, 3 months ago
The following changes since commit 50e7a40af372ee5931c99ef7390f5d3d6fbf6ec4:

  Merge tag 'pull-target-arm-20230824' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-08-24 10:08:33 -0400)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 29a8238510df27080b0ffa92c58400412ce19daa:

  configure: remove unnecessary mkdir -p (2023-08-28 10:01:44 +0200)

----------------------------------------------------------------
* separate accepted and auto-installed versions of Python dependencies
* bump tricore container to Debian 11
* small configure cleanups

----------------------------------------------------------------
Ake Koomsin (1):
      target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE

Paolo Bonzini (13):
      configure: fix and complete detection of tricore tools
      dockerfiles: bump tricore cross compiler container to Debian 11
      python: mkvenv: tweak the matching of --diagnose to depspecs
      python: mkvenv: introduce TOML-like representation of dependencies
      python: mkvenv: add ensuregroup command
      lcitool: bump libvirt-ci submodule and regenerate
      configure: never use PyPI for Meson
      python: use vendored tomli
      configure: switch to ensuregroup
      Revert "tests: Use separate virtual environment for avocado"
      tests/docker: add python3-tomli dependency to containers
      configure: fix container_hosts misspellings and duplications
      configure: remove unnecessary mkdir -p

 .gitlab-ci.d/buildtest.yml                         |   6 +-
 .gitlab-ci.d/cirrus/freebsd-13.vars                |   2 +-
 .gitlab-ci.d/cirrus/macos-12.vars                  |   2 +-
 configure                                          |  31 +---
 docs/devel/acpi-bits.rst                           |   6 +-
 docs/devel/testing.rst                             |  14 +-
 python/scripts/mkvenv.py                           | 201 +++++++++++++++++++--
 python/scripts/vendor.py                           |   5 +-
 python/setup.cfg                                   |   6 +
 python/wheels/tomli-2.0.1-py3-none-any.whl         | Bin 0 -> 12757 bytes
 pythondeps.toml                                    |  32 ++++
 scripts/ci/org.centos/stream/8/x86_64/test-avocado |   4 +-
 scripts/device-crash-test                          |   2 +-
 target/i386/cpu.c                                  |   6 +-
 target/i386/cpu.h                                  |   1 +
 tests/Makefile.include                             |  19 +-
 tests/docker/dockerfiles/centos8.docker            |   3 +-
 .../dockerfiles/debian-all-test-cross.docker       |   7 +-
 tests/docker/dockerfiles/debian-amd64-cross.docker |   6 +-
 tests/docker/dockerfiles/debian-amd64.docker       |   4 +
 tests/docker/dockerfiles/debian-arm64-cross.docker |   6 +-
 tests/docker/dockerfiles/debian-armel-cross.docker |   6 +-
 tests/docker/dockerfiles/debian-armhf-cross.docker |   6 +-
 .../docker/dockerfiles/debian-hexagon-cross.docker |   6 +-
 .../dockerfiles/debian-mips64el-cross.docker       |   6 +-
 .../docker/dockerfiles/debian-mipsel-cross.docker  |   6 +-
 .../docker/dockerfiles/debian-ppc64el-cross.docker |   6 +-
 .../docker/dockerfiles/debian-riscv64-cross.docker |   2 +-
 tests/docker/dockerfiles/debian-s390x-cross.docker |   6 +-
 .../docker/dockerfiles/debian-tricore-cross.docker |   4 +-
 tests/docker/dockerfiles/fedora-i386-cross.docker  |   1 +
 tests/docker/dockerfiles/fedora-win32-cross.docker |   2 +-
 tests/docker/dockerfiles/fedora-win64-cross.docker |   2 +-
 tests/docker/dockerfiles/opensuse-leap.docker      |  22 +--
 tests/docker/dockerfiles/ubuntu2004.docker         |   4 +-
 tests/docker/dockerfiles/ubuntu2204.docker         |   1 +
 tests/lcitool/libvirt-ci                           |   2 +-
 tests/lcitool/mappings.yml                         |  28 ++-
 tests/lcitool/projects/qemu.yml                    |   3 +-
 tests/lcitool/targets/opensuse-leap-15.yml         |   4 +-
 tests/requirements.txt                             |   6 -
 tests/vm/Makefile.include                          |   2 +-
 tests/vm/generated/freebsd.json                    |   1 +
 43 files changed, 377 insertions(+), 112 deletions(-)
 create mode 100644 python/wheels/tomli-2.0.1-py3-none-any.whl
 create mode 100644 pythondeps.toml
 delete mode 100644 tests/requirements.txt
-- 
2.41.0
Re: [PULL 00/14] Python, i386 changes for 2023-08-28
Posted by Stefan Hajnoczi 1 year, 3 months ago
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.
Re: [PULL 00/14] Python, i386 changes for 2023-08-28
Posted by Stefan Hajnoczi 1 year, 3 months ago
Hi Paolo,
I see a new test error that may have been introduced by this pull request:
https://gitlab.com/qemu-project/qemu/-/jobs/4968468877#L131

AVOCADO Downloading avocado tests VM image for s390x
Failed to load plugin from module "avocado.plugins.journal":
ImportError("Module 'sqlite3' is not installed.\nUse:\n sudo zypper
install python311\nto install it.") :
File "/builds/qemu-project/qemu/build/pyvenv/lib64/python3.11/site-packages/avocado/core/extension_manager.py",
line 63, in __init__
plugin = ep.load()
^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkg_resources/__init__.py",
line 2517, in load
return self.resolve()
^^^^^^^^^^^^^^
File "/usr/lib/python3.11/site-packages/pkg_resources/__init__.py",
line 2523, in resolve
module = __import__(self.module_name, fromlist=['__name__'], level=0)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/builds/qemu-project/qemu/build/pyvenv/lib64/python3.11/site-packages/avocado/plugins/journal.py",
line 19, in <module>
import sqlite3
File "/usr/lib64/python3.11/_import_failed/sqlite3.py", line 16, in <module>

Stefan

On Mon, 28 Aug 2023 at 06:41, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 50e7a40af372ee5931c99ef7390f5d3d6fbf6ec4:
>
>   Merge tag 'pull-target-arm-20230824' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-08-24 10:08:33 -0400)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 29a8238510df27080b0ffa92c58400412ce19daa:
>
>   configure: remove unnecessary mkdir -p (2023-08-28 10:01:44 +0200)
>
> ----------------------------------------------------------------
> * separate accepted and auto-installed versions of Python dependencies
> * bump tricore container to Debian 11
> * small configure cleanups
>
> ----------------------------------------------------------------
> Ake Koomsin (1):
>       target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE
>
> Paolo Bonzini (13):
>       configure: fix and complete detection of tricore tools
>       dockerfiles: bump tricore cross compiler container to Debian 11
>       python: mkvenv: tweak the matching of --diagnose to depspecs
>       python: mkvenv: introduce TOML-like representation of dependencies
>       python: mkvenv: add ensuregroup command
>       lcitool: bump libvirt-ci submodule and regenerate
>       configure: never use PyPI for Meson
>       python: use vendored tomli
>       configure: switch to ensuregroup
>       Revert "tests: Use separate virtual environment for avocado"
>       tests/docker: add python3-tomli dependency to containers
>       configure: fix container_hosts misspellings and duplications
>       configure: remove unnecessary mkdir -p
>
>  .gitlab-ci.d/buildtest.yml                         |   6 +-
>  .gitlab-ci.d/cirrus/freebsd-13.vars                |   2 +-
>  .gitlab-ci.d/cirrus/macos-12.vars                  |   2 +-
>  configure                                          |  31 +---
>  docs/devel/acpi-bits.rst                           |   6 +-
>  docs/devel/testing.rst                             |  14 +-
>  python/scripts/mkvenv.py                           | 201 +++++++++++++++++++--
>  python/scripts/vendor.py                           |   5 +-
>  python/setup.cfg                                   |   6 +
>  python/wheels/tomli-2.0.1-py3-none-any.whl         | Bin 0 -> 12757 bytes
>  pythondeps.toml                                    |  32 ++++
>  scripts/ci/org.centos/stream/8/x86_64/test-avocado |   4 +-
>  scripts/device-crash-test                          |   2 +-
>  target/i386/cpu.c                                  |   6 +-
>  target/i386/cpu.h                                  |   1 +
>  tests/Makefile.include                             |  19 +-
>  tests/docker/dockerfiles/centos8.docker            |   3 +-
>  .../dockerfiles/debian-all-test-cross.docker       |   7 +-
>  tests/docker/dockerfiles/debian-amd64-cross.docker |   6 +-
>  tests/docker/dockerfiles/debian-amd64.docker       |   4 +
>  tests/docker/dockerfiles/debian-arm64-cross.docker |   6 +-
>  tests/docker/dockerfiles/debian-armel-cross.docker |   6 +-
>  tests/docker/dockerfiles/debian-armhf-cross.docker |   6 +-
>  .../docker/dockerfiles/debian-hexagon-cross.docker |   6 +-
>  .../dockerfiles/debian-mips64el-cross.docker       |   6 +-
>  .../docker/dockerfiles/debian-mipsel-cross.docker  |   6 +-
>  .../docker/dockerfiles/debian-ppc64el-cross.docker |   6 +-
>  .../docker/dockerfiles/debian-riscv64-cross.docker |   2 +-
>  tests/docker/dockerfiles/debian-s390x-cross.docker |   6 +-
>  .../docker/dockerfiles/debian-tricore-cross.docker |   4 +-
>  tests/docker/dockerfiles/fedora-i386-cross.docker  |   1 +
>  tests/docker/dockerfiles/fedora-win32-cross.docker |   2 +-
>  tests/docker/dockerfiles/fedora-win64-cross.docker |   2 +-
>  tests/docker/dockerfiles/opensuse-leap.docker      |  22 +--
>  tests/docker/dockerfiles/ubuntu2004.docker         |   4 +-
>  tests/docker/dockerfiles/ubuntu2204.docker         |   1 +
>  tests/lcitool/libvirt-ci                           |   2 +-
>  tests/lcitool/mappings.yml                         |  28 ++-
>  tests/lcitool/projects/qemu.yml                    |   3 +-
>  tests/lcitool/targets/opensuse-leap-15.yml         |   4 +-
>  tests/requirements.txt                             |   6 -
>  tests/vm/Makefile.include                          |   2 +-
>  tests/vm/generated/freebsd.json                    |   1 +
>  43 files changed, 377 insertions(+), 112 deletions(-)
>  create mode 100644 python/wheels/tomli-2.0.1-py3-none-any.whl
>  create mode 100644 pythondeps.toml
>  delete mode 100644 tests/requirements.txt
> --
> 2.41.0
>
>