From 2e843536600118579254eb4832b0552c4b016e1d Mon Sep 17 00:00:00 2001 From: likui Date: Mon, 9 Oct 2023 10:41:41 +0800 Subject: [PATCH] Remove importlib-metadata from requirements We don't need it anymore as we don't support python < 3.8 Also it was removed from global requirements so it breaks the requirements check. Change-Id: I9a053e4a2fd11b3cfcf2d9de6ba6441c7d5b0dc2 --- openstack/connection.py | 7 +------ requirements.txt | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/openstack/connection.py b/openstack/connection.py index 9055077a2..c993dbdd7 100644 --- a/openstack/connection.py +++ b/openstack/connection.py @@ -201,15 +201,10 @@ Additional information about the services can be found in the """ import atexit import concurrent.futures +import importlib.metadata as importlib_metadata import warnings import weakref -try: - # For python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata # type: ignore import keystoneauth1.exceptions import requestsexceptions diff --git a/requirements.txt b/requirements.txt index 25fb9a198..ad1c7e95a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ cryptography>=2.7 # BSD/Apache-2.0 decorator>=4.4.1 # BSD dogpile.cache>=0.6.5 # BSD -importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 iso8601>=0.1.11 # MIT jmespath>=0.9.0 # MIT jsonpatch!=1.20,>=1.16 # BSD