From 6c9978a9062da6cc3f9cc1859bf63c72b057cabb Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 18 Oct 2022 14:38:37 +1100 Subject: [PATCH] Order old importlib-metadata results by group A Debian Buster-based zuul-jobs test started failing when using stestr recently [1]. Upon further investigation, this is a Python 3.7 environment which is affected by a recent breaking change to importlib_metadata. It seems stevedore worked around this with Ib9c2b0a14edea91e97d122d2ac93b650029f918e, which was released with 3.5.1 -- but I was still seeing the issue. Upon further investigation, the "real_groups" dict being returned here with importlib-metadata 4.12.0 is in buckets by group, e.g. {'group.one': [EntryPoint(name='foo', ... , group='group.one'), EntryPoint(name='bar', ... , group='group.one')], 'group.two': [EntryPoint(name='moo', ... , group='group.two'), EntryPoint(name='goo', ... , group='group.two')], } This current code seems to return a dict with entry-points by thier name, e.g. {'foo': EntryPoint(name='foo', ... , group='group.one), 'bar': EntryPoint(name='bar', ... , group='group.one), 'moo': EntryPoint(name='moo', ... , group='group.two), 'goo': EntryPoint(name='goo', ... , group='group.two) } This reorgansies the fixup routine to put entry-points in a bucket by their group. With this change, stestr is again finding it's command plugins. [1] https://github.com/mtreinish/stestr/issues/336 [2] https://github.com/python/importlib_metadata/issues/409 Change-Id: I3496ab1dfa312b1098a869cdfd9a0c6f81653b28 (cherry picked from commit 5189992d719ad15e0e3504947895bf5ba9dc7a1d) (cherry picked from commit 93f1e0937c9eadd79050c12808d8a2b8b4f2646b) --- stevedore/_cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stevedore/_cache.py b/stevedore/_cache.py index 288d740..63f6129 100644 --- a/stevedore/_cache.py +++ b/stevedore/_cache.py @@ -110,7 +110,8 @@ def _build_cacheable_data(): # importlib-metadata 4.0 or later (or stdlib importlib.metadata in # Python 3.9 or later) real_groups = { - name: real_groups.select(name=name) for name in real_groups.names + group: real_groups.select(group=group) + for group in real_groups.groups } # Convert the namedtuple values to regular tuples