From dbf8be4edb9b2a70f29ead190a78a5cda2782b26 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 3 Oct 2024 02:43:24 +0900 Subject: [PATCH] Remove unused usage of pkg_resources pbr is in requirements now so should always exist. pkg_resourcs was removed in Python 3.12 [1] and can no longer be used. [1] https://docs.python.org/3/whatsnew/3.12.html#ensurepip Change-Id: I1f1d5c75f10b6f232dd2bf23fc963693f8388f98 --- taskflow/version.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/taskflow/version.py b/taskflow/version.py index 7f7fcd9a1..12403ff74 100644 --- a/taskflow/version.py +++ b/taskflow/version.py @@ -14,19 +14,14 @@ # License for the specific language governing permissions and limitations # under the License. -import pkg_resources +from pbr import version as pbr_version TASK_VENDOR = "OpenStack Foundation" TASK_PRODUCT = "OpenStack TaskFlow" TASK_PACKAGE = None # OS distro package version suffix -try: - from pbr import version as pbr_version - _version_info = pbr_version.VersionInfo('taskflow') - version_string = _version_info.version_string -except ImportError: - _version_info = pkg_resources.get_distribution('taskflow') - version_string = lambda: _version_info.version +_version_info = pbr_version.VersionInfo('taskflow') +version_string = _version_info.version_string def version_string_with_package():