From 32d0f18133480c1ab1e169be866e030697c073ea Mon Sep 17 00:00:00 2001 From: Maxime Boissonneault Date: Wed, 16 Feb 2022 17:03:11 +0000 Subject: [PATCH] use importlib_metadata instead of importlib.metadata for python<3.10 --- setup.cfg | 2 +- src/virtualenv/run/plugin/base.py | 2 +- tasks/__main__zipapp.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index ccd2f8d25..ad084ced1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,7 @@ install_requires = filelock>=3.2,<4 platformdirs>=2,<3 six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms - importlib-metadata>=0.12;python_version<"3.8" + importlib-metadata>=0.12;python_version<"3.10" importlib-resources>=1.0;python_version<"3.7" pathlib2>=2.3.3,<3;python_version < '3.4' and sys.platform != 'win32' python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* diff --git a/src/virtualenv/run/plugin/base.py b/src/virtualenv/run/plugin/base.py index 048c76a41..e4b62e4c5 100644 --- a/src/virtualenv/run/plugin/base.py +++ b/src/virtualenv/run/plugin/base.py @@ -3,7 +3,7 @@ import sys from collections import OrderedDict -if sys.version_info >= (3, 8): +if sys.version_info >= (3, 10): from importlib.metadata import entry_points importlib_metadata_version = () diff --git a/tasks/__main__zipapp.py b/tasks/__main__zipapp.py index 3aa97ca24..5dfece1d5 100644 --- a/tasks/__main__zipapp.py +++ b/tasks/__main__zipapp.py @@ -92,7 +92,7 @@ def __init__(self, content): def versioned_distribution_class(): global _VER_DISTRIBUTION_CLASS if _VER_DISTRIBUTION_CLASS is None: - if sys.version_info >= (3, 8): + if sys.version_info >= (3, 10): # noinspection PyCompatibility from importlib.metadata import Distribution else: