From b49860e98ecd3c2a72735e00023c833e0b25a954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn?= Date: Thu, 17 Apr 2025 21:21:38 +0200 Subject: [PATCH 1/3] Remove pkg_resources --- doc/conf.py | 2 -- src/stepfunctions/__init__.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 2889cfa..40801b9 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -13,7 +13,6 @@ from __future__ import absolute_import import os -import pkg_resources import sys from datetime import datetime from unittest.mock import MagicMock @@ -50,7 +49,6 @@ def __getattr__(cls, name): sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) project = u"stepfunctions" -version = pkg_resources.require(project)[0].version # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. diff --git a/src/stepfunctions/__init__.py b/src/stepfunctions/__init__.py index a1711c3..c14a8cc 100644 --- a/src/stepfunctions/__init__.py +++ b/src/stepfunctions/__init__.py @@ -13,10 +13,8 @@ from __future__ import absolute_import import logging -import pkg_resources import sys -__version__ = pkg_resources.require("stepfunctions")[0].version __useragent__ = "aws-step-functions-data-science-sdk-python" # disable logging.warning() from import packages From 7edcdea84cd23866e32ffd99fe692b445746ab97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn?= Date: Fri, 18 Apr 2025 22:55:37 +0200 Subject: [PATCH 2/3] Add back versions but with importlib this time --- doc/conf.py | 2 ++ src/stepfunctions/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/conf.py b/doc/conf.py index 40801b9..72c9cde 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,6 +12,7 @@ # permissions and limitations under the License. from __future__ import absolute_import +import importlib import os import sys from datetime import datetime @@ -49,6 +50,7 @@ def __getattr__(cls, name): sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) project = u"stepfunctions" +version = importlib.metadata.version(project) # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. diff --git a/src/stepfunctions/__init__.py b/src/stepfunctions/__init__.py index c14a8cc..256b09a 100644 --- a/src/stepfunctions/__init__.py +++ b/src/stepfunctions/__init__.py @@ -12,9 +12,11 @@ # permissions and limitations under the License. from __future__ import absolute_import +import importlib import logging import sys +__version__ = importlib.metadata.version("stepfunctions") __useragent__ = "aws-step-functions-data-science-sdk-python" # disable logging.warning() from import packages From c9ba6f90d06d3f405010767cfc13d406bfa87899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn?= Date: Fri, 18 Apr 2025 23:00:47 +0200 Subject: [PATCH 3/3] Fix import for importlib --- doc/conf.py | 4 ++-- src/stepfunctions/__init__.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 72c9cde..230645b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,10 +12,10 @@ # permissions and limitations under the License. from __future__ import absolute_import -import importlib import os import sys from datetime import datetime +from importlib.metadata import version as importlib_version from unittest.mock import MagicMock class Mock(MagicMock): @@ -50,7 +50,7 @@ def __getattr__(cls, name): sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES) project = u"stepfunctions" -version = importlib.metadata.version(project) +version = importlib_version(project) # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. diff --git a/src/stepfunctions/__init__.py b/src/stepfunctions/__init__.py index 256b09a..f4a7ba1 100644 --- a/src/stepfunctions/__init__.py +++ b/src/stepfunctions/__init__.py @@ -12,11 +12,12 @@ # permissions and limitations under the License. from __future__ import absolute_import -import importlib import logging import sys -__version__ = importlib.metadata.version("stepfunctions") +from importlib.metadata import version as importlib_version + +__version__ = importlib_version("stepfunctions") __useragent__ = "aws-step-functions-data-science-sdk-python" # disable logging.warning() from import packages