From e18da80d6fad27e7e77659e88f44fbc25a927855 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 6 Jun 2025 14:40:39 +1200 Subject: [PATCH 1/4] Remove pkgutil extend_path. --- src/cmlibs/__init__.py | 3 --- src/cmlibs/utils/__init__.py | 17 +---------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/cmlibs/__init__.py b/src/cmlibs/__init__.py index 53615a6..e69de29 100644 --- a/src/cmlibs/__init__.py +++ b/src/cmlibs/__init__.py @@ -1,3 +0,0 @@ -# Namespace package initialisation file. -from pkgutil import extend_path -__path__ = extend_path(__path__, __name__) diff --git a/src/cmlibs/utils/__init__.py b/src/cmlibs/utils/__init__.py index 0657a5c..190008b 100644 --- a/src/cmlibs/utils/__init__.py +++ b/src/cmlibs/utils/__init__.py @@ -1,19 +1,4 @@ import importlib.metadata -import sys -print("Python version:", sys.version) -xx = ('', 'X.Y.Z') -try: - xx = ("importlib.metadata version:", importlib.metadata.version("importlib.metadata")) -except: - pass -try: - xx = ("importlib-metadata version:", importlib.metadata.version("importlib-metadata")) -except: - pass -try: - xx = ("importlib_metadata version:", importlib.metadata.version("importlib_metadata")) -except: - pass -print(xx) __version__ = importlib.metadata.version("cmlibs.utils") +print('cmlibs.utils:', __version__) From efd81b59f1a99ad79b973475f817e46ec43ff50f Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 6 Jun 2025 14:57:10 +1200 Subject: [PATCH 2/4] Use cmlibs_utils for metadata package name. --- src/cmlibs/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmlibs/utils/__init__.py b/src/cmlibs/utils/__init__.py index 190008b..a543e21 100644 --- a/src/cmlibs/utils/__init__.py +++ b/src/cmlibs/utils/__init__.py @@ -1,4 +1,4 @@ import importlib.metadata -__version__ = importlib.metadata.version("cmlibs.utils") +__version__ = importlib.metadata.version("cmlibs_utils") print('cmlibs.utils:', __version__) From 97e10ffd26153df58de515bc91c4b976100eb494 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 6 Jun 2025 15:17:49 +1200 Subject: [PATCH 3/4] Remove print statement from __init__.py. --- src/cmlibs/utils/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cmlibs/utils/__init__.py b/src/cmlibs/utils/__init__.py index a543e21..79760ca 100644 --- a/src/cmlibs/utils/__init__.py +++ b/src/cmlibs/utils/__init__.py @@ -1,4 +1,3 @@ import importlib.metadata __version__ = importlib.metadata.version("cmlibs_utils") -print('cmlibs.utils:', __version__) From fe6e4fab2dba8c3a17dd88a7b61583e5e56c8163 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 6 Jun 2025 15:51:11 +1200 Subject: [PATCH 4/4] Re-instate pkgutil extend_path. --- src/cmlibs/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmlibs/__init__.py b/src/cmlibs/__init__.py index e69de29..53615a6 100644 --- a/src/cmlibs/__init__.py +++ b/src/cmlibs/__init__.py @@ -0,0 +1,3 @@ +# Namespace package initialisation file. +from pkgutil import extend_path +__path__ = extend_path(__path__, __name__)