From 68591a43bdbf0b89be6f3b7c8e517fd25c42bfd8 Mon Sep 17 00:00:00 2001 From: Rajul Kumar Date: Wed, 28 Feb 2024 17:42:16 -0500 Subject: [PATCH 1/2] Fix importing version from importlib.metadata for py<3.8 importlib.metadata is available for py3.8 and later versions. This fails for py<3.8, however, it could be imported from importlib_metadata for previous versions. This patch makes it compatible for py<3.8 as the lib is used on RHEL/UBI8 with py3.6. --- src/pushsource/_impl/compat_attr.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pushsource/_impl/compat_attr.py b/src/pushsource/_impl/compat_attr.py index 86dc7118..628e1be8 100644 --- a/src/pushsource/_impl/compat_attr.py +++ b/src/pushsource/_impl/compat_attr.py @@ -1,5 +1,12 @@ -from importlib.metadata import version import attr +# importlib.metadata is available for py3.8 and higher +# previous versions get it from importlib_metadata installed +# from importlib-metadata +try: + from importlib.metadata import version +except ImportError: # pragma: no cover + from importlib_metadata import version + # Wrappers for attr module to deal with some incompatibilities between versions From 931cd4507d0f4ddf326e179cd7284b93a3a59d06 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 22:55:00 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pushsource/_impl/compat_attr.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pushsource/_impl/compat_attr.py b/src/pushsource/_impl/compat_attr.py index 628e1be8..ac8e7bcc 100644 --- a/src/pushsource/_impl/compat_attr.py +++ b/src/pushsource/_impl/compat_attr.py @@ -1,11 +1,12 @@ import attr + # importlib.metadata is available for py3.8 and higher # previous versions get it from importlib_metadata installed # from importlib-metadata try: - from importlib.metadata import version + from importlib.metadata import version except ImportError: # pragma: no cover - from importlib_metadata import version + from importlib_metadata import version # Wrappers for attr module to deal with some incompatibilities between versions