Control: tags 1125825 + patch Control: tags 1125825 + pending Dear maintainer,
I've prepared an NMU for q2templates (versioned as 2024.5.0+ds-3.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for q2templates-2024.5.0+ds q2templates-2024.5.0+ds changelog | 8 ++++ control | 1 patches/0001-MAINT-pkg_resources-deprecation.patch | 35 +++++++++++++++++++++ patches/series | 1 4 files changed, 44 insertions(+), 1 deletion(-) diff -Nru q2templates-2024.5.0+ds/debian/changelog q2templates-2024.5.0+ds/debian/changelog --- q2templates-2024.5.0+ds/debian/changelog 2025-01-26 22:20:05.000000000 +0200 +++ q2templates-2024.5.0+ds/debian/changelog 2026-03-03 19:51:17.000000000 +0200 @@ -1,3 +1,11 @@ +q2templates (2024.5.0+ds-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream change to move away from python3-pkg-resources. + (Closes: #1125825) + + -- Adrian Bunk <[email protected]> Tue, 03 Mar 2026 19:51:17 +0200 + q2templates (2024.5.0+ds-3) unstable; urgency=medium * Team upload. diff -Nru q2templates-2024.5.0+ds/debian/control q2templates-2024.5.0+ds/debian/control --- q2templates-2024.5.0+ds/debian/control 2025-01-26 22:18:06.000000000 +0200 +++ q2templates-2024.5.0+ds/debian/control 2026-03-03 19:51:17.000000000 +0200 @@ -24,7 +24,6 @@ ${misc:Depends}, ${python3:Depends}, python3-pandas, - python3-pkg-resources, python3-jinja2, libjs-bootstrap, libjs-jquery, diff -Nru q2templates-2024.5.0+ds/debian/patches/0001-MAINT-pkg_resources-deprecation.patch q2templates-2024.5.0+ds/debian/patches/0001-MAINT-pkg_resources-deprecation.patch --- q2templates-2024.5.0+ds/debian/patches/0001-MAINT-pkg_resources-deprecation.patch 1970-01-01 02:00:00.000000000 +0200 +++ q2templates-2024.5.0+ds/debian/patches/0001-MAINT-pkg_resources-deprecation.patch 2026-03-03 19:50:44.000000000 +0200 @@ -0,0 +1,35 @@ +From ba3e92d92918e620c77e23d0442608a1a678a061 Mon Sep 17 00:00:00 2001 +From: Chloe Herman <[email protected]> +Date: Fri, 21 Mar 2025 13:15:51 -0700 +Subject: MAINT: `pkg_resources` deprecation + +Co-authored-by: Liz Gehret <[email protected]> +--- + q2templates/_templates.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/q2templates/_templates.py b/q2templates/_templates.py +index e6bf159..4023041 100644 +--- a/q2templates/_templates.py ++++ b/q2templates/_templates.py +@@ -8,7 +8,7 @@ + + import inspect + import os +-import pkg_resources ++import importlib + import shutil + import tempfile + +@@ -35,7 +35,7 @@ def render(source_files, output_dir, context=None): + src = get_iterable(source_files) + # TODO: Hook into qiime.sdk.config.TemporaryDirectory() when it exists + temp_dir = tempfile.TemporaryDirectory() +- template_data = pkg_resources.resource_filename('q2templates', 'templates') ++ template_data = importlib.resources.files('q2templates') / 'templates' + env = Environment(loader=FileSystemLoader(temp_dir.name), auto_reload=True) + + shutil.copy2(os.path.join(template_data, 'base.html'), temp_dir.name) +-- +2.47.3 + diff -Nru q2templates-2024.5.0+ds/debian/patches/series q2templates-2024.5.0+ds/debian/patches/series --- q2templates-2024.5.0+ds/debian/patches/series 2025-01-26 22:17:39.000000000 +0200 +++ q2templates-2024.5.0+ds/debian/patches/series 2026-03-03 19:51:03.000000000 +0200 @@ -1,2 +1,3 @@ jquery_remove_version.patch python3.12.patch +0001-MAINT-pkg_resources-deprecation.patch
