diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-24 20:46:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-24 20:46:47 +0000 |
| commit | 2d486d9061406cee6e2f79e825becaf21920152c (patch) | |
| tree | 2582512c4593067a52df2ddb6ac6e023cffca2a8 | |
| parent | 180c1351fb4142ea91719f6fbc1a1c8c7eb8e005 (diff) | |
| parent | 1356157ec803d71a4c844032857044e2024ac708 (diff) | |
| download | ironic-python-agent-2d486d9061406cee6e2f79e825becaf21920152c.tar.gz | |
Merge "Remove importlib-metadata from requirements"
| -rw-r--r-- | ironic_python_agent/version.py | 7 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ironic_python_agent/version.py b/ironic_python_agent/version.py index 3c0bdb35..a7bf3f3f 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 d84bb89d..55ec6650 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 |