* [RFC PATCH 1/3] Python: Drop support for Python 3.7
2023-09-04 9:57 [RFC PATCH 0/3] drop support for Python 3.7 and Debian 10 Paolo Bonzini
@ 2023-09-04 9:57 ` Paolo Bonzini
2023-09-04 10:34 ` Philippe Mathieu-Daudé
2023-09-04 9:57 ` [RFC PATCH 2/3] mkvenv: assume presence of importlib.metadata Paolo Bonzini
2023-09-04 9:57 ` [RFC PATCH 3/3] Revert "mkvenv: work around broken pip installations on Debian 10" Paolo Bonzini
2 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2023-09-04 9:57 UTC (permalink / raw)
To: qemu-devel; +Cc: jsnow, armbru, peter.maydell, berrange
Debian 10 is not anymore a supported distro, since Debian 12 was
released on June 10, 2023. Our supported build platforms as of today
all support at least 3.8 (and all of them except for Ubuntu 20.04
support 3.9):
openSUSE Leap 15.5: 3.6.15 (3.11.2)
CentOS Stream 8: 3.6.8 (3.8.13, 3.9.16, 3.11.4)
CentOS Stream 9: 3.9.17 (3.11.4)
Fedora 37: 3.11.4
Fedora 38: 3.11.4
Debian 11: 3.9.2
Debian 12: 3.11.2
Alpine 3.14, 3.15: 3.9.16
Alpine 3.16, 3.17: 3.10.10
Ubuntu 20.04 LTS: 3.8.10
Ubuntu 22.04 LTS: 3.10.12
NetBSD 9.3: 3.9.13*
FreeBSD 12.4: 3.9.16
FreeBSD 13.1: 3.9.18
OpenBSD 7.2: 3.9.17
Note: NetBSD does not appear to have a default meta-package, but offers
several options, the lowest of which is 3.7.15. However, "python39"
appears to be a pre-requisite to one of the other packages we request
in tests/vm/netbsd.
Since it is safe to under our supported platform policy, bump our
minimum supported version of Python to 3.8. The two most interesting
features to have by default include:
- the importlib.metadata module, whose lack is responsible for over 100
lines of code in mkvenv.py
- improvements to asyncio, for example asyncio.CancelledError
inherits from BaseException rather than Exception
In addition, code can now use the assignment operator ':='
Because mypy now learns about importlib.metadata, a small change to
mkvenv.py is needed to pass type checking.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 8 ++++----
python/Makefile | 8 ++++----
python/scripts/mkvenv.py | 5 ++++-
python/setup.cfg | 7 +++----
python/tests/minreqs.txt | 2 +-
scripts/qapi/mypy.ini | 2 +-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/configure b/configure
index 83bbdfe8cdc..72e21cf5b62 100755
--- a/configure
+++ b/configure
@@ -552,16 +552,16 @@ if test -n "$linux_arch" && ! test -d "$source_path/linux-headers/asm-$linux_arc
fi
check_py_version() {
- # We require python >= 3.7.
+ # We require python >= 3.8.
# NB: a True python conditional creates a non-zero return code (Failure)
- "$1" -c 'import sys; sys.exit(sys.version_info < (3,7))'
+ "$1" -c 'import sys; sys.exit(sys.version_info < (3,8))'
}
first_python=
if test -z "${PYTHON}"; then
# A bare 'python' is traditionally python 2.x, but some distros
# have it as python 3.x, so check in both places.
- for binary in python3 python python3.11 python3.10 python3.9 python3.8 python3.7; do
+ for binary in python3 python python3.11 python3.10 python3.9 python3.8; do
if has "$binary"; then
python=$(command -v "$binary")
if check_py_version "$python"; then
@@ -952,7 +952,7 @@ then
fi
if ! check_py_version "$python"; then
- error_exit "Cannot use '$python', Python >= 3.7 is required." \
+ error_exit "Cannot use '$python', Python >= 3.8 is required." \
"Use --python=/path/to/python to specify a supported Python." \
"Maybe try:" \
" openSUSE Leap 15.3+: zypper install python39" \
diff --git a/python/Makefile b/python/Makefile
index 7c70dcc8d14..1fa4ba2498e 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -9,13 +9,13 @@ help:
@echo "make check-minreqs:"
@echo " Run tests in the minreqs virtual environment."
@echo " These tests use the oldest dependencies."
- @echo " Requires: Python 3.7"
- @echo " Hint (Fedora): 'sudo dnf install python3.7'"
+ @echo " Requires: Python 3.8"
+ @echo " Hint (Fedora): 'sudo dnf install python3.8'"
@echo ""
@echo "make check-tox:"
@echo " Run tests against multiple python versions."
@echo " These tests use the newest dependencies."
- @echo " Requires: Python 3.7 - 3.11, and tox."
+ @echo " Requires: Python 3.8 - 3.11, and tox."
@echo " Hint (Fedora): 'sudo dnf install python3-tox python3.11'"
@echo " The variable QEMU_TOX_EXTRA_ARGS can be use to pass extra"
@echo " arguments to tox".
@@ -59,7 +59,7 @@ PIP_INSTALL = pip install --disable-pip-version-check
min-venv: $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate
$(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg tests/minreqs.txt
@echo "VENV $(QEMU_MINVENV_DIR)"
- @python3.7 -m venv $(QEMU_MINVENV_DIR)
+ @python3.8 -m venv $(QEMU_MINVENV_DIR)
@( \
echo "ACTIVATE $(QEMU_MINVENV_DIR)"; \
. $(QEMU_MINVENV_DIR)/bin/activate; \
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 4f2349fbb65..57a24948031 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -435,6 +435,7 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator[str]:
try:
# First preference: Python 3.8+ stdlib
from importlib.metadata import ( # type: ignore
+ EntryPoint,
PackageNotFoundError,
distribution,
)
@@ -442,6 +443,7 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator[str]:
logger.debug("%s", str(exc))
# Second preference: Commonly available PyPI backport
from importlib_metadata import ( # type: ignore
+ EntryPoint,
PackageNotFoundError,
distribution,
)
@@ -449,7 +451,8 @@ def _gen_importlib(packages: Sequence[str]) -> Iterator[str]:
def _generator() -> Iterator[str]:
for package in packages:
try:
- entry_points = distribution(package).entry_points
+ entry_points: Iterator[EntryPoint] = \
+ iter(distribution(package).entry_points)
except PackageNotFoundError:
continue
diff --git a/python/setup.cfg b/python/setup.cfg
index e74b58a8c24..f6d2d8a1362 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -14,7 +14,6 @@ classifiers =
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python :: 3 :: Only
- Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
@@ -22,7 +21,7 @@ classifiers =
Typing :: Typed
[options]
-python_requires = >= 3.7
+python_requires = >= 3.8
packages =
qemu.qmp
qemu.machine
@@ -76,7 +75,7 @@ exclude = __pycache__,
[mypy]
strict = True
-python_version = 3.7
+python_version = 3.8
warn_unused_configs = True
namespace_packages = True
warn_unused_ignores = False
@@ -192,7 +191,7 @@ multi_line_output=3
# of python available on your system to run this test.
[tox:tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py38, py39, py310, py311
skip_missing_interpreters = true
[testenv]
diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt
index 979461be6bb..a3f423efd84 100644
--- a/python/tests/minreqs.txt
+++ b/python/tests/minreqs.txt
@@ -1,5 +1,5 @@
# This file lists the ***oldest possible dependencies*** needed to run
-# "make check" successfully under ***Python 3.7***. It is used primarily
+# "make check" successfully under ***Python 3.8***. It is used primarily
# by GitLab CI to ensure that our stated minimum versions in setup.cfg
# are truthful and regularly validated.
#
diff --git a/scripts/qapi/mypy.ini b/scripts/qapi/mypy.ini
index 3463307ddc7..56e0dfb1327 100644
--- a/scripts/qapi/mypy.ini
+++ b/scripts/qapi/mypy.ini
@@ -1,7 +1,7 @@
[mypy]
strict = True
disallow_untyped_calls = False
-python_version = 3.7
+python_version = 3.8
[mypy-qapi.schema]
disallow_untyped_defs = False
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [RFC PATCH 1/3] Python: Drop support for Python 3.7
2023-09-04 9:57 ` [RFC PATCH 1/3] Python: Drop support for Python 3.7 Paolo Bonzini
@ 2023-09-04 10:34 ` Philippe Mathieu-Daudé
2023-09-05 6:00 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-09-04 10:34 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: jsnow, armbru, peter.maydell, berrange
On 4/9/23 11:57, Paolo Bonzini wrote:
> Debian 10 is not anymore a supported distro, since Debian 12 was
> released on June 10, 2023. Our supported build platforms as of today
> all support at least 3.8 (and all of them except for Ubuntu 20.04
> support 3.9):
>
> openSUSE Leap 15.5: 3.6.15 (3.11.2)
> CentOS Stream 8: 3.6.8 (3.8.13, 3.9.16, 3.11.4)
> CentOS Stream 9: 3.9.17 (3.11.4)
> Fedora 37: 3.11.4
> Fedora 38: 3.11.4
> Debian 11: 3.9.2
> Debian 12: 3.11.2
> Alpine 3.14, 3.15: 3.9.16
> Alpine 3.16, 3.17: 3.10.10
> Ubuntu 20.04 LTS: 3.8.10
> Ubuntu 22.04 LTS: 3.10.12
> NetBSD 9.3: 3.9.13*
> FreeBSD 12.4: 3.9.16
> FreeBSD 13.1: 3.9.18
> OpenBSD 7.2: 3.9.17
>
> Note: NetBSD does not appear to have a default meta-package, but offers
> several options, the lowest of which is 3.7.15. However, "python39"
> appears to be a pre-requisite to one of the other packages we request
> in tests/vm/netbsd.
>
> Since it is safe to under our supported platform policy, bump our
Is 'under' a verb? This sentence is not obvious to me.
> minimum supported version of Python to 3.8. The two most interesting
> features to have by default include:
>
> - the importlib.metadata module, whose lack is responsible for over 100
> lines of code in mkvenv.py
>
> - improvements to asyncio, for example asyncio.CancelledError
> inherits from BaseException rather than Exception
>
> In addition, code can now use the assignment operator ':='
>
> Because mypy now learns about importlib.metadata, a small change to
> mkvenv.py is needed to pass type checking.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 8 ++++----
> python/Makefile | 8 ++++----
> python/scripts/mkvenv.py | 5 ++++-
> python/setup.cfg | 7 +++----
> python/tests/minreqs.txt | 2 +-
> scripts/qapi/mypy.ini | 2 +-
> 6 files changed, 17 insertions(+), 15 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH 1/3] Python: Drop support for Python 3.7
2023-09-04 10:34 ` Philippe Mathieu-Daudé
@ 2023-09-05 6:00 ` Paolo Bonzini
2023-09-05 8:38 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2023-09-05 6:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, John Snow, Armbruster, Markus, Maydell, Peter,
P. Berrange, Daniel
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
Il lun 4 set 2023, 12:34 Philippe Mathieu-Daudé <philmd@linaro.org> ha
scritto:
> > Since it is safe to under our supported platform policy, bump our
>
> Is 'under' a verb? This sentence is not obvious to me.
>
No, just drop "to".
Paolo
> > minimum supported version of Python to 3.8. The two most interesting
> > features to have by default include:
> >
> > - the importlib.metadata module, whose lack is responsible for over 100
> > lines of code in mkvenv.py
> >
> > - improvements to asyncio, for example asyncio.CancelledError
> > inherits from BaseException rather than Exception
> >
> > In addition, code can now use the assignment operator ':='
> >
> > Because mypy now learns about importlib.metadata, a small change to
> > mkvenv.py is needed to pass type checking.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > configure | 8 ++++----
> > python/Makefile | 8 ++++----
> > python/scripts/mkvenv.py | 5 ++++-
> > python/setup.cfg | 7 +++----
> > python/tests/minreqs.txt | 2 +-
> > scripts/qapi/mypy.ini | 2 +-
> > 6 files changed, 17 insertions(+), 15 deletions(-)
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>
>
[-- Attachment #2: Type: text/html, Size: 2176 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RFC PATCH 1/3] Python: Drop support for Python 3.7
2023-09-05 6:00 ` Paolo Bonzini
@ 2023-09-05 8:38 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-09-05 8:38 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, John Snow, Armbruster, Markus, Maydell, Peter,
P. Berrange, Daniel
On 5/9/23 08:00, Paolo Bonzini wrote:
>
>
> Il lun 4 set 2023, 12:34 Philippe Mathieu-Daudé <philmd@linaro.org
> <mailto:philmd@linaro.org>> ha scritto:
>
> > Since it is safe to under our supported platform policy, bump our
>
> Is 'under' a verb? This sentence is not obvious to me.
>
>
> No, just drop "to".
Argh, now it is clearly obvious... :)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [RFC PATCH 2/3] mkvenv: assume presence of importlib.metadata
2023-09-04 9:57 [RFC PATCH 0/3] drop support for Python 3.7 and Debian 10 Paolo Bonzini
2023-09-04 9:57 ` [RFC PATCH 1/3] Python: Drop support for Python 3.7 Paolo Bonzini
@ 2023-09-04 9:57 ` Paolo Bonzini
2023-09-04 9:57 ` [RFC PATCH 3/3] Revert "mkvenv: work around broken pip installations on Debian 10" Paolo Bonzini
2 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2023-09-04 9:57 UTC (permalink / raw)
To: qemu-devel; +Cc: jsnow, armbru, peter.maydell, berrange
importlib.metadata is included in Python 3.8, so there is no
need to fallback to either importlib-metadata or pkgresources
when generating console script shims.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
python/scripts/mkvenv.py | 197 ++++++---------------------------------
python/setup.cfg | 9 --
2 files changed, 28 insertions(+), 178 deletions(-)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 57a24948031..6797e12e349 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -61,7 +61,6 @@
"""
-# The duplication between importlib and pkg_resources does not help
# pylint: disable=too-many-lines
# Copyright (C) 2022-2023 Red Hat, Inc.
@@ -74,6 +73,13 @@
# later. See the COPYING file in the top-level directory.
import argparse
+from importlib.metadata import (
+ Distribution,
+ EntryPoint,
+ PackageNotFoundError,
+ distribution,
+ version,
+)
from importlib.util import find_spec
import logging
import os
@@ -428,25 +434,7 @@ def _stringify(data: Union[str, bytes]) -> str:
print(builder.get_value("env_exe"))
-def _gen_importlib(packages: Sequence[str]) -> Iterator[str]:
- # pylint: disable=import-outside-toplevel
- # pylint: disable=no-name-in-module
- # pylint: disable=import-error
- try:
- # First preference: Python 3.8+ stdlib
- from importlib.metadata import ( # type: ignore
- EntryPoint,
- PackageNotFoundError,
- distribution,
- )
- except ImportError as exc:
- logger.debug("%s", str(exc))
- # Second preference: Commonly available PyPI backport
- from importlib_metadata import ( # type: ignore
- EntryPoint,
- PackageNotFoundError,
- distribution,
- )
+def _get_entry_points(packages: Sequence[str]) -> Iterator[str]:
def _generator() -> Iterator[str]:
for package in packages:
@@ -468,24 +456,6 @@ def _generator() -> Iterator[str]:
return _generator()
-def _gen_pkg_resources(packages: Sequence[str]) -> Iterator[str]:
- # pylint: disable=import-outside-toplevel
- # Bundled with setuptools; has a good chance of being available.
- import pkg_resources
-
- def _generator() -> Iterator[str]:
- for package in packages:
- try:
- eps = pkg_resources.get_entry_map(package, "console_scripts")
- except pkg_resources.DistributionNotFound:
- continue
-
- for entry_point in eps.values():
- yield str(entry_point)
-
- return _generator()
-
-
def generate_console_scripts(
packages: Sequence[str],
python_path: Optional[str] = None,
@@ -510,30 +480,11 @@ def generate_console_scripts(
if not packages:
return
- def _get_entry_points() -> Iterator[str]:
- """Python 3.7 compatibility shim for iterating entry points."""
- # Python 3.8+, or Python 3.7 with importlib_metadata installed.
- try:
- return _gen_importlib(packages)
- except ImportError as exc:
- logger.debug("%s", str(exc))
-
- # Python 3.7 with setuptools installed.
- try:
- return _gen_pkg_resources(packages)
- except ImportError as exc:
- logger.debug("%s", str(exc))
- raise Ouch(
- "Neither importlib.metadata nor pkg_resources found, "
- "can't generate console script shims.\n"
- "Use Python 3.8+, or install importlib-metadata or setuptools."
- ) from exc
-
maker = distlib.scripts.ScriptMaker(None, bin_path)
maker.variants = {""}
maker.clobber = False
- for entry_point in _get_entry_points():
+ for entry_point in _get_entry_points(packages):
for filename in maker.make(entry_point):
logger.debug("wrote console_script '%s'", filename)
@@ -587,57 +538,6 @@ def pkgname_from_depspec(dep_spec: str) -> str:
return match.group(0)
-def _get_path_importlib(package: str) -> Optional[str]:
- # pylint: disable=import-outside-toplevel
- # pylint: disable=no-name-in-module
- # pylint: disable=import-error
- try:
- # First preference: Python 3.8+ stdlib
- from importlib.metadata import ( # type: ignore
- PackageNotFoundError,
- distribution,
- )
- except ImportError as exc:
- logger.debug("%s", str(exc))
- # Second preference: Commonly available PyPI backport
- from importlib_metadata import ( # type: ignore
- PackageNotFoundError,
- distribution,
- )
-
- try:
- return str(distribution(package).locate_file("."))
- except PackageNotFoundError:
- return None
-
-
-def _get_path_pkg_resources(package: str) -> Optional[str]:
- # pylint: disable=import-outside-toplevel
- # Bundled with setuptools; has a good chance of being available.
- import pkg_resources
-
- try:
- return str(pkg_resources.get_distribution(package).location)
- except pkg_resources.DistributionNotFound:
- return None
-
-
-def _get_path(package: str) -> Optional[str]:
- try:
- return _get_path_importlib(package)
- except ImportError as exc:
- logger.debug("%s", str(exc))
-
- try:
- return _get_path_pkg_resources(package)
- except ImportError as exc:
- logger.debug("%s", str(exc))
- raise Ouch(
- "Neither importlib.metadata nor pkg_resources found. "
- "Use Python 3.8+, or install importlib-metadata or setuptools."
- ) from exc
-
-
def _path_is_prefix(prefix: Optional[str], path: str) -> bool:
try:
return (
@@ -647,65 +547,14 @@ def _path_is_prefix(prefix: Optional[str], path: str) -> bool:
return False
-def _is_system_package(package: str) -> bool:
- path = _get_path(package)
- return path is not None and not (
+def _is_system_package(dist: Distribution) -> bool:
+ path = str(dist.locate_file("."))
+ return not (
_path_is_prefix(sysconfig.get_path("purelib"), path)
or _path_is_prefix(sysconfig.get_path("platlib"), path)
)
-def _get_version_importlib(package: str) -> Optional[str]:
- # pylint: disable=import-outside-toplevel
- # pylint: disable=no-name-in-module
- # pylint: disable=import-error
- try:
- # First preference: Python 3.8+ stdlib
- from importlib.metadata import ( # type: ignore
- PackageNotFoundError,
- distribution,
- )
- except ImportError as exc:
- logger.debug("%s", str(exc))
- # Second preference: Commonly available PyPI backport
- from importlib_metadata import ( # type: ignore
- PackageNotFoundError,
- distribution,
- )
-
- try:
- return str(distribution(package).version)
- except PackageNotFoundError:
- return None
-
-
-def _get_version_pkg_resources(package: str) -> Optional[str]:
- # pylint: disable=import-outside-toplevel
- # Bundled with setuptools; has a good chance of being available.
- import pkg_resources
-
- try:
- return str(pkg_resources.get_distribution(package).version)
- except pkg_resources.DistributionNotFound:
- return None
-
-
-def _get_version(package: str) -> Optional[str]:
- try:
- return _get_version_importlib(package)
- except ImportError as exc:
- logger.debug("%s", str(exc))
-
- try:
- return _get_version_pkg_resources(package)
- except ImportError as exc:
- logger.debug("%s", str(exc))
- raise Ouch(
- "Neither importlib.metadata nor pkg_resources found. "
- "Use Python 3.8+, or install importlib-metadata or setuptools."
- ) from exc
-
-
def diagnose(
dep_spec: str,
online: bool,
@@ -731,7 +580,11 @@ def diagnose(
bad = False
pkg_name = pkgname_from_depspec(dep_spec)
- pkg_version = _get_version(pkg_name)
+ pkg_version: Optional[str] = None
+ try:
+ pkg_version = version(pkg_name)
+ except PackageNotFoundError:
+ pass
lines = []
@@ -868,19 +721,25 @@ def _do_ensure(
constraint = _make_version_constraint(info, False)
matcher = distlib.version.LegacyMatcher(name + constraint)
print(f"mkvenv: checking for {matcher}", file=sys.stderr)
- ver = _get_version(name)
+
+ dist: Optional[Distribution] = None
+ try:
+ dist = distribution(matcher.name)
+ except PackageNotFoundError:
+ pass
+
if (
- ver is None
+ dist is None
# Always pass installed package to pip, so that they can be
# updated if the requested version changes
- or not _is_system_package(name)
- or not matcher.match(distlib.version.LegacyVersion(ver))
+ or not _is_system_package(dist)
+ or not matcher.match(distlib.version.LegacyVersion(dist.version))
):
absent.append(name + _make_version_constraint(info, True))
if len(absent) == 1:
canary = info.get("canary", None)
else:
- logger.info("found %s %s", name, ver)
+ logger.info("found %s %s", name, dist.version)
present.append(name)
if present:
diff --git a/python/setup.cfg b/python/setup.cfg
index f6d2d8a1362..8c67dce4579 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -108,15 +108,6 @@ ignore_missing_imports = True
[mypy-pygments]
ignore_missing_imports = True
-[mypy-importlib.metadata]
-ignore_missing_imports = True
-
-[mypy-importlib_metadata]
-ignore_missing_imports = True
-
-[mypy-pkg_resources]
-ignore_missing_imports = True
-
[mypy-distlib]
ignore_missing_imports = True
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [RFC PATCH 3/3] Revert "mkvenv: work around broken pip installations on Debian 10"
2023-09-04 9:57 [RFC PATCH 0/3] drop support for Python 3.7 and Debian 10 Paolo Bonzini
2023-09-04 9:57 ` [RFC PATCH 1/3] Python: Drop support for Python 3.7 Paolo Bonzini
2023-09-04 9:57 ` [RFC PATCH 2/3] mkvenv: assume presence of importlib.metadata Paolo Bonzini
@ 2023-09-04 9:57 ` Paolo Bonzini
2 siblings, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2023-09-04 9:57 UTC (permalink / raw)
To: qemu-devel; +Cc: jsnow, armbru, peter.maydell, berrange
Debian 10 has Python 3.7, so it is not possible to use it anymore
now that Python 3.8 is required.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
python/scripts/mkvenv.py | 74 +++++++++-------------------------------
1 file changed, 16 insertions(+), 58 deletions(-)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 6797e12e349..d0b9c215ca2 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -61,8 +61,6 @@
"""
-# pylint: disable=too-many-lines
-
# Copyright (C) 2022-2023 Red Hat, Inc.
#
# Authors:
@@ -195,7 +193,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
):
kwargs["with_pip"] = False
else:
- check_ensurepip(suggest_remedy=True)
+ check_ensurepip()
super().__init__(*args, **kwargs)
@@ -300,7 +298,7 @@ def need_ensurepip() -> bool:
return True
-def check_ensurepip(prefix: str = "", suggest_remedy: bool = False) -> None:
+def check_ensurepip() -> None:
"""
Check that we have ensurepip.
@@ -311,15 +309,12 @@ def check_ensurepip(prefix: str = "", suggest_remedy: bool = False) -> None:
"Python's ensurepip module is not found.\n"
"It's normally part of the Python standard library, "
"maybe your distribution packages it separately?\n"
- "(Debian puts ensurepip in its python3-venv package.)\n"
+ "Either install ensurepip, or alleviate the need for it in the "
+ "first place by installing pip and setuptools for "
+ f"'{sys.executable}'.\n"
+ "(Hint: Debian puts ensurepip in its python3-venv package.)"
)
- if suggest_remedy:
- msg += (
- "Either install ensurepip, or alleviate the need for it in the"
- " first place by installing pip and setuptools for "
- f"'{sys.executable}'.\n"
- )
- raise Ouch(prefix + msg)
+ raise Ouch(msg)
# ensurepip uses pyexpat, which can also go missing on us:
if not find_spec("pyexpat"):
@@ -327,15 +322,12 @@ def check_ensurepip(prefix: str = "", suggest_remedy: bool = False) -> None:
"Python's pyexpat module is not found.\n"
"It's normally part of the Python standard library, "
"maybe your distribution packages it separately?\n"
- "(NetBSD's pkgsrc debundles this to e.g. 'py310-expat'.)\n"
+ "Either install pyexpat, or alleviate the need for it in the "
+ "first place by installing pip and setuptools for "
+ f"'{sys.executable}'.\n\n"
+ "(Hint: NetBSD's pkgsrc debundles this to e.g. 'py310-expat'.)"
)
- if suggest_remedy:
- msg += (
- "Either install pyexpat, or alleviate the need for it in the "
- "first place by installing pip and setuptools for "
- f"'{sys.executable}'.\n"
- )
- raise Ouch(prefix + msg)
+ raise Ouch(msg)
def make_venv( # pylint: disable=too-many-arguments
@@ -489,38 +481,6 @@ def generate_console_scripts(
logger.debug("wrote console_script '%s'", filename)
-def checkpip() -> bool:
- """
- Debian10 has a pip that's broken when used inside of a virtual environment.
-
- We try to detect and correct that case here.
- """
- try:
- # pylint: disable=import-outside-toplevel,unused-import,import-error
- # pylint: disable=redefined-outer-name
- import pip._internal # type: ignore # noqa: F401
-
- logger.debug("pip appears to be working correctly.")
- return False
- except ModuleNotFoundError as exc:
- if exc.name == "pip._internal":
- # Uh, fair enough. They did say "internal".
- # Let's just assume it's fine.
- return False
- logger.warning("pip appears to be malfunctioning: %s", str(exc))
-
- check_ensurepip("pip appears to be non-functional, and ")
-
- logger.debug("Attempting to repair pip ...")
- subprocess.run(
- (sys.executable, "-m", "ensurepip"),
- stdout=subprocess.DEVNULL,
- check=True,
- )
- logger.debug("Pip is now (hopefully) repaired!")
- return True
-
-
def pkgname_from_depspec(dep_spec: str) -> str:
"""
Parse package name out of a PEP-508 depspec.
@@ -877,12 +837,10 @@ def post_venv_setup() -> None:
This is intended to be run *inside the venv* after it is created.
"""
logger.debug("post_venv_setup()")
- # Test for a broken pip (Debian 10 or derivative?) and fix it if needed
- if not checkpip():
- # Finally, generate a 'pip' script so the venv is usable in a normal
- # way from the CLI. This only happens when we inherited pip from a
- # parent/system-site and haven't run ensurepip in some way.
- generate_console_scripts(["pip"])
+ # Generate a 'pip' script so the venv is usable in a normal
+ # way from the CLI. This only happens when we inherited pip from a
+ # parent/system-site and haven't run ensurepip in some way.
+ generate_console_scripts(["pip"])
def _add_create_subcommand(subparsers: Any) -> None:
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread