Skip to content

Commit ddbc70f

Browse files
committed
Add Py 3.14, drop Py < 3.12. Make Acquisition an optional dependency.
1 parent d5fc068 commit ddbc70f

4 files changed

Lines changed: 12 additions & 14 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ jobs:
1212
strategy:
1313
matrix:
1414
python-version:
15-
- "pypy-3.10"
16-
- "3.11"
1715
- "3.12"
1816
- "3.13"
17+
- "3.14"
1918
extras:
2019
- "[test,docs]"
2120
# include:
@@ -35,6 +34,7 @@ jobs:
3534
run: |
3635
python -m pip install -U pip setuptools wheel
3736
python -m pip install -U coverage
37+
python -m pip install -U Acquisition
3838
python -m pip install -v -U -e ".${{ matrix.extras }}"
3939
- name: Test
4040
run: |

CHANGES.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
=========
44

55

6-
1.0.1 (unreleased)
6+
1.1.0 (unreleased)
77
==================
88

9-
- Nothing changed yet.
9+
- Add support for Python 3.14; drop support for Python < 3.12.
10+
- Acquisition is an optional dependency, not installed by default.
1011

1112

1213
1.0.0 (2024-11-12)

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ def _read(fname):
4747
'License :: OSI Approved :: Apache Software License',
4848
'Programming Language :: Python :: 3',
4949
'Programming Language :: Python :: 3 :: Only',
50-
'Programming Language :: Python :: 3.10',
51-
'Programming Language :: Python :: 3.11',
5250
'Programming Language :: Python :: 3.12',
5351
'Programming Language :: Python :: 3.13',
52+
'Programming Language :: Python :: 3.14',
5453
'Programming Language :: Python :: Implementation :: CPython',
5554
'Programming Language :: Python :: Implementation :: PyPy',
5655
],
@@ -60,7 +59,6 @@ def _read(fname):
6059
package_dir={'': 'src'},
6160
include_package_data=True,
6261
install_requires=[
63-
'Acquisition',
6462
'BTrees',
6563
'nti.externalization',
6664
'nti.ntiids',
@@ -85,5 +83,5 @@ def _read(fname):
8583
],
8684
},
8785
entry_points=entry_points,
88-
python_requires=">=3.10",
86+
python_requires=">=3.12",
8987
)

src/nti/intid/utility.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
intids. The primary reason to do this is to provide better exceptions,
66
and future proofing of behaviour.
77
"""
8-
9-
from __future__ import division
10-
from __future__ import print_function
11-
from __future__ import absolute_import
12-
13-
from Acquisition import aq_base
8+
try:
9+
from Acquisition import aq_base
10+
except ModuleNotFoundError: # pragma: no cover
11+
def aq_base(obj):
12+
return obj
1413

1514
import BTrees
1615

0 commit comments

Comments
 (0)