diff --git a/changelog.d/20240212_115536_regis_pkg_resources.md b/changelog.d/20240212_115536_regis_pkg_resources.md new file mode 100644 index 0000000..35b6d20 --- /dev/null +++ b/changelog.d/20240212_115536_regis_pkg_resources.md @@ -0,0 +1 @@ +- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb) diff --git a/tutorminio/plugin.py b/tutorminio/plugin.py index d8bc7be..9d6130d 100644 --- a/tutorminio/plugin.py +++ b/tutorminio/plugin.py @@ -4,7 +4,7 @@ import typing as t from glob import glob -import pkg_resources +import importlib_resources from tutor import hooks as tutor_hooks from tutor.__about__ import __version_suffix__ @@ -76,7 +76,7 @@ def add_minio_hosts( # Add the "templates" folder as a template root tutor_hooks.Filters.ENV_TEMPLATE_ROOTS.add_item( - pkg_resources.resource_filename("tutorminio", "templates") + str(importlib_resources.files("tutorminio") / "templates") ) # Render the "build" and "apps" folders tutor_hooks.Filters.ENV_TEMPLATE_TARGETS.add_items( @@ -86,12 +86,7 @@ def add_minio_hosts( ], ) # Load patches from files -for path in glob( - os.path.join( - pkg_resources.resource_filename("tutorminio", "patches"), - "*", - ) -): +for path in glob(str(importlib_resources.files("tutorminio") / "patches" / "*")): with open(path, encoding="utf-8") as patch_file: tutor_hooks.Filters.ENV_PATCHES.add_item( (os.path.basename(path), patch_file.read())