From 70aa002396f05c6ac19f00dc4c3734c5279707f7 Mon Sep 17 00:00:00 2001 From: Maria Grimaldi Date: Fri, 21 Nov 2025 13:06:45 +0100 Subject: [PATCH 1/2] chore: make plugin compatible with py312 --- plugins/tutor-contrib-scout-apm/setup.py | 5 +---- plugins/tutor-contrib-scout-apm/tutor_scout_apm/plugin.py | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/tutor-contrib-scout-apm/setup.py b/plugins/tutor-contrib-scout-apm/setup.py index f385a3a..5db9121 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.12", install_requires=["tutor"], extras_require={"dev": ["tutor[dev]>=16.0.0,<19.0.0"]}, entry_points={ @@ -52,9 +52,6 @@ def load_about(): "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], ) 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), "*", ) ) From 7aa2200fdabf7cf3f92fb6f3deade1f4ede4718a Mon Sep 17 00:00:00 2001 From: Maria Grimaldi Date: Fri, 21 Nov 2025 14:31:37 +0100 Subject: [PATCH 2/2] refactor: go back to supporting >= py39 --- plugins/tutor-contrib-scout-apm/setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/tutor-contrib-scout-apm/setup.py b/plugins/tutor-contrib-scout-apm/setup.py index 5db9121..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.12", + python_requires=">=3.9", install_requires=["tutor"], extras_require={"dev": ["tutor[dev]>=16.0.0,<19.0.0"]}, entry_points={ @@ -52,6 +52,9 @@ def load_about(): "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ], )