Merge "Replace deprecated pkg_resources with importlib"
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
import json
|
||||
|
||||
from importlib import metadata as importlib_metadata
|
||||
import pkg_resources
|
||||
|
||||
release_string = importlib_metadata.distribution('nodepool').version
|
||||
|
||||
@@ -23,7 +22,7 @@ is_release = None
|
||||
git_version = None
|
||||
try:
|
||||
_metadata = json.loads(
|
||||
pkg_resources.get_distribution('nodepool').get_metadata('pbr.json'))
|
||||
importlib_metadata.distribution('nodepool').read_text('pbr.json'))
|
||||
if _metadata:
|
||||
is_release = _metadata['is_release']
|
||||
git_version = _metadata['git_version']
|
||||
|
Reference in New Issue
Block a user