Add 3.14. Fix test breakage with new repoze.sendmail. Pin to old setuptools because pyramid still requires it..

Author: jamadden

.github/workflows/tests.yml

@@ -16,6 +16,7 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
         extras:
           - "[test,docs]"
         # include:
@@ -35,15 +36,15 @@ jobs:
       run: |
         python -m pip install -U pip setuptools wheel
         python -m pip install -U coverage
-        python -m pip install -v -U -e ".${{ matrix.extras }}"
+        python -m pip install -v -U ".${{ matrix.extras }}"
     - name: Test
       run: |
         coverage run -m zope.testrunner -v --test-path=src  --color --auto-progress --slow-test=3
         coverage run -a -m sphinx -b doctest -d docs/_build/doctrees docs docs/_build/doctests
         coverage combine || true
         coverage report -i || true
     - name: Lint
-      if: matrix.python-version == '3.12'
+      if: matrix.python-version == '3.14'
       run: |
         python -m pip install -U pylint
         pylint src

CHANGES.rst

@@ -2,11 +2,13 @@
  Changes
 =========
 
-1.0.1 (unreleased)
+1.1.0 (unreleased)
 ==================
 
-- Nothing changed yet.
-
+- Add support for Python 3.14.
+- Pin our ``setuptools`` runtime dependency at < 82, because our
+  ``pyramide`` dependency still depends on ``pkg_resources`` which was
+  removed at that version.
 
 1.0.0 (2024-11-12)
 ==================

docs/conf.py

@@ -21,10 +21,9 @@
 # sys.path.insert(0, os.path.abspath('.'))
 import os
 import sys
-import pkg_resources
+from importlib.metadata import version as meta_version
 sys.path.append(os.path.abspath('../src'))
-rqmt = pkg_resources.require('nti.mailer')[0]
-
+nt_ver = meta_version('nti.mailer')
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -75,16 +74,16 @@
 # built documents.
 #
 # The short X.Y version.
-version = '%s.%s' % tuple(map(int, rqmt.version.split('.')[:2]))
+version = '%s.%s' % tuple(map(int, nt_ver.split('.')[:2]))
 # The full version, including alpha/beta/rc tags.
-release = rqmt.version
+release = nt_ver
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -216,9 +215,7 @@
     'site': ('https://zopesite.readthedocs.io/en/latest/', None,),
     'testing': ('https://ntitesting.readthedocs.io/en/latest/', None),
     'traversing': ('https://zopetraversing.readthedocs.io/en/latest/', None),
-    'zodb': ('http://www.zodb.org/en/latest/', None),
     'external': ('https://ntiexternalization.readthedocs.io/en/latest/', None),
-    'acquisition': ('https://acquisition.readthedocs.io/en/latest', None,),
     'zcintid': ('https://zcintid.readthedocs.io/en/latest', None),
     'zopeintid': ('https://zopeintid.readthedocs.io/en/latest', None,),
     'location': ('https://zopelocation.readthedocs.io/en/latest', None,),

setup.py

@@ -50,6 +50,7 @@ def _read(fname):
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
@@ -60,7 +61,9 @@ def _read(fname):
     include_package_data=True,
     install_requires=[
         'gevent',
-        'setuptools',
+        # Need older setuptools because pyramid relies on
+        # pkg_resources, which was removed in 82.
+        'setuptools < 82',
         'boto3',
         'BTrees',
         'itsdangerous',

src/nti/mailer/tests/test_queue.py

@@ -26,9 +26,6 @@
 from repoze.sendmail.delivery import QueuedMailDelivery
 from repoze.sendmail.maildir import Maildir
 
-# pylint:disable-next=import-private-name
-from repoze.sendmail.tests.test_delivery import _makeMailerStub
-
 from nti.mailer.queue import SESMailer
 from nti.mailer.queue import MailerWatcher
 
@@ -37,6 +34,16 @@
 
 MSG_BYTES = MSG_STRING if isinstance(MSG_STRING, bytes) else MSG_STRING.encode('ascii')
 
+def _makeMailerStub(*args, **kw):
+    class MailerStub:
+        def __init__(self, *args, **kw):
+            self.sent_messages = []
+
+        def send(self, fromaddr, toaddrs, message):
+            self.sent_messages.append((fromaddr, toaddrs, message))
+
+    return MailerStub(*args, **kw)
+
 class TestMailer(unittest.TestCase):
 
     def setUp(self):

tox.ini

@@ -1,18 +1,14 @@
 [tox]
-envlist = pypy,py27,py36,pypy3,py37,py38,py39,coverage,docs
+envlist = py310,py311,py312,py313,py314,py315,coverage,docs
 
 [testenv]
-usedevelop = true
 extras = test
 commands =
          zope-testrunner --test-path=src  --auto-color --auto-progress [] # substitute with tox positional args
 setenv =
     ZOPE_INTERFACE_STRICT_IRO=1
 
 [testenv:coverage]
-usedevelop = true
-basepython =
-    python3.9
 commands =
     coverage run -m zope.testrunner --test-path=src []
     coverage html
@@ -21,8 +17,6 @@ deps =
     coverage
 
 [testenv:docs]
-basepython =
-    python3.9
 commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
 extras = docs