From 22858e38ebae24698a91bc383ae66cf67a31f058 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 26 Jan 2024 11:25:22 -0500 Subject: [PATCH 1/2] Replace pkg_resources with importlib.metadata. As of setuptools 68.0.0, the entire pkg_resources library is deprecated. Switch away from pkg_resources.iter_entry_points and instead use importlib.metadata.entry_points(), which provides the same information in a slightly different format. Signed-off-by: Chris Lalancette --- flake8_import_order/styles.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/flake8_import_order/styles.py b/flake8_import_order/styles.py index ff13cee..d47abd7 100644 --- a/flake8_import_order/styles.py +++ b/flake8_import_order/styles.py @@ -1,6 +1,11 @@ from collections import namedtuple -from pkg_resources import iter_entry_points +import sys + +if sys.version_info >= (3, 8): + import importlib.metadata as importlib_metadata +else: + import importlib_metadata from flake8_import_order import ClassifiedImport, ImportType, NewLine @@ -8,14 +13,21 @@ def list_entry_points(): - return iter_entry_points('flake8_import_order.styles') + entry_points = importlib_metadata.entry_points() + if hasattr(entry_points, 'select'): + styles_groups = entry_points.select(group='flake8_import_order.styles') + else: + styles_groups = entry_points.get('flake8_import_order.styles', []) + + return styles_groups def lookup_entry_point(name): - try: - return next(iter_entry_points('flake8_import_order.styles', name=name)) - except StopIteration: - raise LookupError(f'Unknown style {name}') + for style in list_entry_points(): + if style.name == name: + return style + + raise LookupError('Unknown style {}'.format(name)) class Style: From 372e6746eb2942058b2da51654edc70d6f8e613a Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 26 Jan 2024 15:25:03 -0500 Subject: [PATCH 2/2] pep8 fixes. Signed-off-by: Chris Lalancette --- flake8_import_order/styles.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake8_import_order/styles.py b/flake8_import_order/styles.py index d47abd7..6656eab 100644 --- a/flake8_import_order/styles.py +++ b/flake8_import_order/styles.py @@ -1,6 +1,5 @@ -from collections import namedtuple - import sys +from collections import namedtuple if sys.version_info >= (3, 8): import importlib.metadata as importlib_metadata