diff --git a/aiosmtpd-pr557-pkg_resources.patch b/aiosmtpd-pr557-pkg_resources.patch new file mode 100644 index 0000000..ab6e2e7 --- /dev/null +++ b/aiosmtpd-pr557-pkg_resources.patch @@ -0,0 +1,47 @@ +From 533ed1304c57bc7179bf88e5f5f81f4bb329b1dd Mon Sep 17 00:00:00 2001 +From: John Bucy +Date: Wed, 18 Jun 2025 11:05:23 -0700 +Subject: [PATCH 1/2] migrate config_test from pkg_resources to + importlib_resources + +pkg_resources is now throwing a deprecation warning +this is only used to get the cert filenames + +https://setuptools.pypa.io/en/latest/pkg_resources.html +https://importlib-resources.readthedocs.io/en/latest/migration.html +--- + aiosmtpd/tests/conftest.py | 13 ++++++++++--- + requirements-dev.txt | 1 + + 2 files changed, 11 insertions(+), 3 deletions(-) + +Index: aiosmtpd-1.4.6/aiosmtpd/tests/conftest.py +=================================================================== +--- aiosmtpd-1.4.6.orig/aiosmtpd/tests/conftest.py ++++ aiosmtpd-1.4.6/aiosmtpd/tests/conftest.py +@@ -12,7 +12,7 @@ from smtplib import SMTP as SMTPClient + from typing import Any, Callable, Generator, NamedTuple, Optional, Type, TypeVar + + import pytest +-from pkg_resources import resource_filename ++import importlib.resources + from pytest_mock import MockFixture + + from aiosmtpd.controller import Controller +@@ -73,8 +73,15 @@ class Global: + # If less than 1.0, might cause intermittent error if test system + # is too busy/overloaded. + AUTOSTOP_DELAY = 1.5 +-SERVER_CRT = resource_filename("aiosmtpd.tests.certs", "server.crt") +-SERVER_KEY = resource_filename("aiosmtpd.tests.certs", "server.key") ++# https://importlib-resources.readthedocs.io/en/latest/migration.html ++# this assumes these files are already present in the filesystem so ++# it doesn't need to extract a tempfile for the context manager to clean up ++ref = importlib.resources.files("aiosmtpd.tests.certs") / "server.crt" ++with importlib.resources.as_file(ref) as path: ++ SERVER_CRT = str(path) ++ref = importlib.resources.files("aiosmtpd.tests.certs") / "server.key" ++with importlib.resources.as_file(ref) as path: ++ SERVER_KEY = str(path) + + # endregion + diff --git a/python-aiosmtpd.changes b/python-aiosmtpd.changes index b54b8f6..bcb8ac7 100644 --- a/python-aiosmtpd.changes +++ b/python-aiosmtpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 2 12:16:00 UTC 2026 - Ben Greiner + +- Add aiosmtpd-pr557-pkg_resources.patch gh#aio-libs/aiosmtpd#557 + for setuptools 80 + ------------------------------------------------------------------- Mon Nov 10 04:59:40 UTC 2025 - Steve Kowalik diff --git a/python-aiosmtpd.spec b/python-aiosmtpd.spec index 9f78eb4..55c62b0 100644 --- a/python-aiosmtpd.spec +++ b/python-aiosmtpd.spec @@ -1,7 +1,7 @@ # # spec file for package python-aiosmtpd # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,8 @@ Source: https://github.com/aio-libs/aiosmtpd/archive/v%{version}.tar.gz# Patch0: support-python-313.patch # PATCH-FIX-OPENSUSE Use inspect.iscorountine Patch1: support-python-314.patch +# PATCH-FIX-UPSTREAM aiosmtpd-pr557-pkg_resources.patch gh#aio-libs/aiosmtpd#557 +Patch2: aiosmtpd-pr557-pkg_resources.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel}