openstack/keystonemiddleware
Code Issues Proposed changes

Get rid of pkg_resources

Browse Source 
... because it was removed in Python 3.12 [1].

[1] https://docs.python.org/3/whatsnew/3.12.html#ensurepip

Change-Id: I7bcbaade79f3d3662487b801263f446f4d30d88f
This commit is contained in:
Takashi Kajinami 2024-10-03 02:14:23 +09:00
parent ceb3aa5ef2
commit a5db32d800
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystonemiddleware/_common/config.py
View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import pkg_resources
import importlib.metadata
from oslo_config import cfg
from oslo_log import log as logging
@ -145,8 +145,8 @@ class Config(object):
if project:
try:
version = pkg_resources.get_distribution(project).version
except pkg_resources.DistributionNotFound:
version = importlib.metadata.version(project)
except importlib.metadata.PackageNotFoundError:
version = "unknown"
project = "%s/%s " % (project, version)

8
keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
View File

@ -1997,8 +1997,8 @@ class TestAuthPluginUserAgentGeneration(BaseAuthTokenMiddlewareTest):
self._assert_user_agent(app, project, ksm_version)
def _create_app(self, conf, project_version, ksm_version):
fake_pkg_resources = mock.Mock()
fake_pkg_resources.get_distribution().version = project_version
fake_im = mock.Mock()
fake_im.return_value = project_version
fake_version_info = mock.Mock()
fake_version_info.version_string.return_value = ksm_version
@ -2007,10 +2007,10 @@ class TestAuthPluginUserAgentGeneration(BaseAuthTokenMiddlewareTest):
body = uuid.uuid4().hex
at_im = 'keystonemiddleware._common.config.importlib.metadata.version'
at_pbr = 'keystonemiddleware._common.config.pbr.version'
with mock.patch('keystonemiddleware._common.config.pkg_resources',
new=fake_pkg_resources):
with mock.patch(at_im, new=fake_im):
with mock.patch(at_pbr, new=fake_pbr_version):
return self.create_simple_middleware(body=body, conf=conf)

8
keystonemiddleware/tests/unit/auth_token/test_config.py
View File

@ -75,12 +75,12 @@ class TestAuthPluginLocalOsloConfig(base.BaseAuthTokenTestCase):
if not project_version:
project_version = uuid.uuid4().hex
fake_pkg_resources = mock.Mock()
fake_pkg_resources.get_distribution().version = project_version
fake_im = mock.Mock()
fake_im.return_value = project_version
body = uuid.uuid4().hex
with mock.patch('keystonemiddleware._common.config.pkg_resources',
new=fake_pkg_resources):
at_im = 'keystonemiddleware._common.config.importlib.metadata.version'
with mock.patch(at_im, new=fake_im):
# use_global_conf is poorly named. What it means is
# don't use the config created in test setUp.
return self.create_simple_middleware(body=body, conf=conf,