From 157c75d9f4cc97916ef8ea6fdab80c60f011da78 Mon Sep 17 00:00:00 2001 From: Thawan Barroso Date: Wed, 6 Aug 2025 16:26:54 +0100 Subject: [PATCH 1/4] fix: update package_dir assignment to use resources.files for compatibility and removing the dependence for a deprecated package (pkg_resources) --- python/ctranslate2/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/ctranslate2/__init__.py b/python/ctranslate2/__init__.py index 88da68aec..fba505144 100644 --- a/python/ctranslate2/__init__.py +++ b/python/ctranslate2/__init__.py @@ -6,9 +6,12 @@ import os import pkg_resources + from importlib import resources module_name = sys.modules[__name__].__name__ - package_dir = pkg_resources.resource_filename(module_name, "") + # Fixed the pkg_resources depreciation + package_dir = str(resources.files(module_name)) + add_dll_directory = getattr(os, "add_dll_directory", None) if add_dll_directory is not None: From 9696bf87782caf8750f3538560c2d9d27e6ab748 Mon Sep 17 00:00:00 2001 From: Thawan Barroso Date: Wed, 6 Aug 2025 16:34:04 +0100 Subject: [PATCH 2/4] fix: refactor import statements for pkg_resources and resources compatibility --- python/ctranslate2/__init__.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/python/ctranslate2/__init__.py b/python/ctranslate2/__init__.py index fba505144..446067231 100644 --- a/python/ctranslate2/__init__.py +++ b/python/ctranslate2/__init__.py @@ -5,12 +5,18 @@ import glob import os - import pkg_resources - from importlib import resources - module_name = sys.modules[__name__].__name__ - # Fixed the pkg_resources depreciation - package_dir = str(resources.files(module_name)) + + # Adressing python 3.9 < version + try: + from importlib import resources + # Fixed the pkg_resources depreciation + package_dir = str(resources.files(module_name)) + except ImportError: + import pkg_resources + package_dir = pkg_resources.resource_filename(module_name, "") + + add_dll_directory = getattr(os, "add_dll_directory", None) From 4e4e6663d97d7fbb3866179f52657a6af43cfc52 Mon Sep 17 00:00:00 2001 From: Thawan Barroso Date: Wed, 6 Aug 2025 16:38:09 +0100 Subject: [PATCH 3/4] fixed formating --- python/ctranslate2/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python/ctranslate2/__init__.py b/python/ctranslate2/__init__.py index 446067231..3f9a7f8de 100644 --- a/python/ctranslate2/__init__.py +++ b/python/ctranslate2/__init__.py @@ -6,18 +6,17 @@ import os module_name = sys.modules[__name__].__name__ - + # Adressing python 3.9 < version try: from importlib import resources + # Fixed the pkg_resources depreciation package_dir = str(resources.files(module_name)) except ImportError: import pkg_resources + package_dir = pkg_resources.resource_filename(module_name, "") - - - add_dll_directory = getattr(os, "add_dll_directory", None) if add_dll_directory is not None: From 1e7091064b99bcd149b113f68ad9efee22992adc Mon Sep 17 00:00:00 2001 From: Thawan Barroso Date: Wed, 6 Aug 2025 16:44:56 +0100 Subject: [PATCH 4/4] fix: update import statement for resources to improve compatibility with Python 3.9+ --- python/ctranslate2/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/ctranslate2/__init__.py b/python/ctranslate2/__init__.py index 3f9a7f8de..b9cc58376 100644 --- a/python/ctranslate2/__init__.py +++ b/python/ctranslate2/__init__.py @@ -9,10 +9,10 @@ # Adressing python 3.9 < version try: - from importlib import resources + from importlib.resources import files # Fixed the pkg_resources depreciation - package_dir = str(resources.files(module_name)) + package_dir = str(files(module_name)) except ImportError: import pkg_resources