Add Py 3.14, drop Py < 3.12. Make Acquisition optional.

Author: jamadden

.github/workflows/tests.yml

@@ -25,10 +25,9 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "pypy-3.10"
-          - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
         extras:
           - "[test,docs]"
         # include:

CHANGES.rst

@@ -2,10 +2,11 @@
  Changes
 =========
 
-1.18.1 (unreleased)
+1.19.0 (unreleased)
 ===================
 
-- Nothing changed yet.
+- Add support for Python 3.14; drop Python < 3.12.
+- Acquisition is now an optional dependency, not installed by default.
 
 
 1.18.0 (2024-11-18)

setup.py

@@ -36,11 +36,9 @@ def _read(fname):
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        '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',
         'Framework :: Zope3',
@@ -50,7 +48,6 @@ def _read(fname):
     include_package_data=True,
     zip_safe=True,
     install_requires=[
-        'Acquisition',
         'nti.i18n >= 1.1.0',
         'zope.event',
         'zope.interface >= 5.0.0',
@@ -74,8 +71,9 @@ def _read(fname):
             'nti.testing',
             'repoze.sphinx.autointerface',
             'sphinx_rtd_theme',
+            'Acquisition',
         ],
     },
     entry_points=entry_points,
-    python_requires=">=3.10",
+    python_requires=">=3.12",
 )

src/nti/schema/fieldproperty.py

@@ -9,31 +9,36 @@
 # stdlib imports
 import sys
 
-from Acquisition import aq_base
-from Acquisition.interfaces import IAcquirer
+
 from zope.schema import interfaces as sch_interfaces
 from zope.schema.fieldproperty import FieldProperty
 from zope.schema.fieldproperty import FieldPropertyStoredThroughField
 from zope.schema.fieldproperty import createFieldProperties
 
 __docformat__ = "restructuredtext en"
 
-class AcquisitionFieldProperty(FieldProperty):
-    """
-    A field property that supports acquisition. Returned objects
-    will be ``__of__`` the instance, and set objects will always be the unwrapped
-    base.
-    """
-
-    def __get__(self, instance, klass):
-        result = super().__get__(instance, klass)
-        # pylint:disable-next=no-value-for-parameter
-        if instance is not None and IAcquirer.providedBy(result):  # even defaults get wrapped
-            result = result.__of__(instance)
-        return result
+try:
+    from Acquisition import aq_base
+    from Acquisition.interfaces import IAcquirer
+except ModuleNotFoundError:
+    pass
+else:
+    class AcquisitionFieldProperty(FieldProperty):
+        """
+        A field property that supports acquisition. Returned objects
+        will be ``__of__`` the instance, and set objects will always be the unwrapped
+        base.
+        """
+
+        def __get__(self, instance, klass):
+            result = super().__get__(instance, klass)
+            # pylint:disable-next=no-value-for-parameter
+            if instance is not None and IAcquirer.providedBy(result):  # even defaults get wrapped
+                result = result.__of__(instance)
+            return result
 
-    def __set__(self, instance, value):
-        super().__set__(instance, aq_base(value))
+        def __set__(self, instance, value):
+            super().__set__(instance, aq_base(value))
 
 class UnicodeConvertingFieldProperty(FieldProperty):
     """

src/nti/schema/tests/test_fieldproperty.py

@@ -12,16 +12,14 @@
 import doctest
 import unittest
 
-from Acquisition import Implicit
-from ExtensionClass import Base
+
 from zope.interface import Interface
 from zope.interface import implementer
 from zope.schema.interfaces import SchemaNotProvided
 from zope.schema.interfaces import WrongType
 
 from nti.schema.field import Object
 from nti.schema.field import ValidTextLine as TextLine
-from nti.schema.fieldproperty import AcquisitionFieldProperty
 from nti.schema.fieldproperty import AdaptingFieldProperty
 from nti.schema.fieldproperty import AdaptingFieldPropertyStoredThroughField
 from nti.schema.fieldproperty import UnicodeConvertingFieldProperty
@@ -50,6 +48,13 @@
 class TestAqFieldProperty(unittest.TestCase):
 
     def test_aq_property(self):
+        try:
+            from Acquisition import Implicit
+            from ExtensionClass import Base
+        except ModuleNotFoundError:
+            self.skipTest('Acquisition not installed')
+
+        from nti.schema.fieldproperty import AcquisitionFieldProperty
 
         class IBaz(Interface):
             pass