[PATCH v4 0/9] improvement to Python detection, preparation for dropping 3.6

Paolo Bonzini posted 9 patches 1 year, 2 months ago
Failed in applying to current master (apply log)
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>, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>
.gitlab-ci.d/static_checks.yml                |   4 +-
configure                                     |  82 ++++-
docs/devel/testing.rst                        |  78 ++--
docs/meson.build                              |   2 +-
python/.gitignore                             |   4 +-
python/Makefile                               |  57 ++-
python/Pipfile                                |  13 -
python/Pipfile.lock                           | 347 ------------------
python/README.rst                             |   3 -
python/qemu/qmp/protocol.py                   |   2 +-
python/qemu/qmp/qmp_client.py                 |   2 +-
python/qemu/utils/qemu_ga_client.py           |   6 +-
python/setup.cfg                              |  11 +-
python/tests/minreqs.txt                      |  45 +++
scripts/qapi/mypy.ini                         |   2 +-
tests/docker/dockerfiles/alpine.docker        |   2 +-
tests/docker/dockerfiles/centos8.docker       |  22 +-
.../dockerfiles/fedora-win32-cross.docker     |   1 +
.../dockerfiles/fedora-win64-cross.docker     |   1 +
tests/docker/dockerfiles/opensuse-leap.docker |  22 +-
tests/docker/dockerfiles/python.docker        |   1 -
tests/docker/dockerfiles/ubuntu2004.docker    |   2 +-
tests/lcitool/libvirt-ci                      |   2 +-
tests/lcitool/mappings.yml                    |  77 ++++
tests/lcitool/targets/centos-stream-8.yml     |   3 +
tests/lcitool/targets/opensuse-leap-153.yml   |   3 +
tests/qemu-iotests/iotests.py                 |   4 +-
.../tests/migrate-bitmaps-postcopy-test       |   2 +-
28 files changed, 321 insertions(+), 479 deletions(-)
delete mode 100644 python/Pipfile
delete mode 100644 python/Pipfile.lock
create mode 100644 python/tests/minreqs.txt
create mode 100644 tests/lcitool/mappings.yml
create mode 100644 tests/lcitool/targets/centos-stream-8.yml
create mode 100644 tests/lcitool/targets/opensuse-leap-153.yml
[PATCH v4 0/9] improvement to Python detection, preparation for dropping 3.6
Posted by Paolo Bonzini 1 year, 2 months ago
This is my take on John's patches to improve Python detection and to
prepare for dropping Python 3.6 support.

The main change with respect to John's work is that lcitool is updated
and the container images for CI can install Sphinx via pip; this
way documentation is still built on the CentOS 8 jobs.

A smaller change is that patch "configure: Look for auxiliary Python
installations" will only look at the $PYTHON variable if it is set,
without falling back to a PATH search.

This series includes the final patch to drop support for Python 3.6,
but it makes sense even without it.

Paolo

Supersedes: <20230221012456.2607692-1-jsnow@redhat.com>

John Snow (5):
  python: support pylint 2.16
  python: drop pipenv
  meson: prefer 'sphinx-build' to 'sphinx-build-3'
  configure: Look for auxiliary Python installations
  configure: Add courtesy hint to Python version failure message

Paolo Bonzini (5):
  configure: protect against escaping venv when running Meson
  lcitool: update submodule
  docs/devel: update and clarify lcitool instructions
  ci, docker: update CentOS and OpenSUSE Python to non-EOL versions
  Python: Drop support for Python 3.6

 .gitlab-ci.d/static_checks.yml                |   4 +-
 configure                                     |  82 ++++-
 docs/devel/testing.rst                        |  78 ++--
 docs/meson.build                              |   2 +-
 python/.gitignore                             |   4 +-
 python/Makefile                               |  57 ++-
 python/Pipfile                                |  13 -
 python/Pipfile.lock                           | 347 ------------------
 python/README.rst                             |   3 -
 python/qemu/qmp/protocol.py                   |   2 +-
 python/qemu/qmp/qmp_client.py                 |   2 +-
 python/qemu/utils/qemu_ga_client.py           |   6 +-
 python/setup.cfg                              |  11 +-
 python/tests/minreqs.txt                      |  45 +++
 scripts/qapi/mypy.ini                         |   2 +-
 tests/docker/dockerfiles/alpine.docker        |   2 +-
 tests/docker/dockerfiles/centos8.docker       |  22 +-
 .../dockerfiles/fedora-win32-cross.docker     |   1 +
 .../dockerfiles/fedora-win64-cross.docker     |   1 +
 tests/docker/dockerfiles/opensuse-leap.docker |  22 +-
 tests/docker/dockerfiles/python.docker        |   1 -
 tests/docker/dockerfiles/ubuntu2004.docker    |   2 +-
 tests/lcitool/libvirt-ci                      |   2 +-
 tests/lcitool/mappings.yml                    |  77 ++++
 tests/lcitool/targets/centos-stream-8.yml     |   3 +
 tests/lcitool/targets/opensuse-leap-153.yml   |   3 +
 tests/qemu-iotests/iotests.py                 |   4 +-
 .../tests/migrate-bitmaps-postcopy-test       |   2 +-
 28 files changed, 321 insertions(+), 479 deletions(-)
 delete mode 100644 python/Pipfile
 delete mode 100644 python/Pipfile.lock
 create mode 100644 python/tests/minreqs.txt
 create mode 100644 tests/lcitool/mappings.yml
 create mode 100644 tests/lcitool/targets/centos-stream-8.yml
 create mode 100644 tests/lcitool/targets/opensuse-leap-153.yml

-- 
2.39.1
Re: [PATCH v4 0/9] improvement to Python detection, preparation for dropping 3.6
Posted by Philippe Mathieu-Daudé 1 year, 1 month ago
On 22/2/23 15:37, Paolo Bonzini wrote:
> This is my take on John's patches to improve Python detection and to
> prepare for dropping Python 3.6 support.
> 
> The main change with respect to John's work is that lcitool is updated
> and the container images for CI can install Sphinx via pip; this
> way documentation is still built on the CentOS 8 jobs.
> 
> A smaller change is that patch "configure: Look for auxiliary Python
> installations" will only look at the $PYTHON variable if it is set,
> without falling back to a PATH search.
> 
> This series includes the final patch to drop support for Python 3.6,
> but it makes sense even without it.
> 
> Paolo
> 
> Supersedes: <20230221012456.2607692-1-jsnow@redhat.com>

FWIW:

Different patches 1 & 2 have been merged 2 days after you posted
this series (merge commit c3aeccc0ab):
- commit aef633e765 ("python: support pylint 2.16")
- commit 6832189fd7 ("python: drop pipenv")

Patch 3 clashes with commit 1b1be8d3cc ("meson: stop
looking for 'sphinx-build-3'")

> John Snow (5):
>    python: support pylint 2.16
>    python: drop pipenv
>    meson: prefer 'sphinx-build' to 'sphinx-build-3'
>    configure: Look for auxiliary Python installations
>    configure: Add courtesy hint to Python version failure message
> 
> Paolo Bonzini (5):
>    configure: protect against escaping venv when running Meson
>    lcitool: update submodule
>    docs/devel: update and clarify lcitool instructions
>    ci, docker: update CentOS and OpenSUSE Python to non-EOL versions
>    Python: Drop support for Python 3.6