From 1356157ec803d71a4c844032857044e2024ac708 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 20 Jun 2022 17:32:39 +0200 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: Ia12cbef3515f823fdd627a36020cf7801bf6d734 --- ironic_python_agent/version.py | 7 +------ requirements.txt | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ironic_python_agent/version.py b/ironic_python_agent/version.py index 3c0bdb35e..a7bf3f3ff 100644 --- a/ironic_python_agent/version.py +++ b/ironic_python_agent/version.py @@ -13,11 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -try: - # For Python 3.8 and later - import importlib.metadata as importlib_metadata -except ImportError: - # For everyone else - import importlib_metadata +from importlib import metadata as importlib_metadata __version__ = importlib_metadata.version("ironic_python_agent") diff --git a/requirements.txt b/requirements.txt index d84bb89da..55ec66506 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -importlib_metadata>=1.7.0;python_version<'3.8' # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT netifaces>=0.10.4 # MIT oslo.config>=5.2.0 # Apache-2.0