diff --git a/plugins/tutor-contrib-scout-apm/setup.py b/plugins/tutor-contrib-scout-apm/setup.py index f385a3a..ab4fc26 100644 --- a/plugins/tutor-contrib-scout-apm/setup.py +++ b/plugins/tutor-contrib-scout-apm/setup.py @@ -38,7 +38,7 @@ def load_about(): long_description=load_readme(), packages=find_packages(exclude=["tests*"]), include_package_data=True, - python_requires=">=3.8", + python_requires=">=3.9", install_requires=["tutor"], extras_require={"dev": ["tutor[dev]>=16.0.0,<19.0.0"]}, entry_points={ diff --git a/plugins/tutor-contrib-scout-apm/tutor_scout_apm/plugin.py b/plugins/tutor-contrib-scout-apm/tutor_scout_apm/plugin.py index 8037798..146941e 100644 --- a/plugins/tutor-contrib-scout-apm/tutor_scout_apm/plugin.py +++ b/plugins/tutor-contrib-scout-apm/tutor_scout_apm/plugin.py @@ -1,9 +1,9 @@ from __future__ import annotations from glob import glob import os -import pkg_resources import uuid +from importlib.resources import files from tutor import hooks as tutor_hooks from .__about__ import __version__ @@ -35,9 +35,10 @@ # For each file in tutor_media/patches, # apply a patch based on the file's name and contents. +patches_dir = files("tutor_scout_apm") / "patches" patch_files = glob( os.path.join( - pkg_resources.resource_filename("tutor_scout_apm", "patches"), + str(patches_dir), "*", ) )