Skip to content

Commit 724df3d

Browse files
committed
build: require cffi 1.17.0
We don't test cffi 1.11.0. With Python moving to isolated build environments that install their own dependencies, we should be able to aggressively use newer versions.
1 parent 58fca18 commit 724df3d

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

docs/news.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Changes
1111
-------
1212

1313
* Bundled zstd library upgraded from 1.5.6 to 1.5.7. (#255)
14-
* We now use a non-rc version of cffi 1.17 on all Python versions. Python
15-
<=3.12 have cffi upgraded from cffi 1.16 -> 1.17.
16-
* The ``pyproject.toml`` file now defines a ``[project]`` section.
14+
* We now use and require cffi 1.17.0 or newer. Previously, the constraint
15+
was >=1.11.0 on Python <3.13.
16+
* The ``pyproject.toml`` file now defines a ``[project]`` section.
1717
* We now use GitHub's native ARM Linux runners to build wheels and run tests.
1818
Previously, Linux ARM wheels were built inside a QEMU virtualized environment
1919
and we didn't run tests on this platform.

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ dependencies = []
2525

2626
[project.optional-dependencies]
2727
cffi = [
28-
'cffi>=1.11 ; python_version < "3.13" and platform_python_implementation != "PyPy"',
2928
'cffi>=1.17 ; python_version >= "3.13" and platform_python_implementation != "PyPy"',
3029
]
3130

setup.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@
2828
# (like memoryview).
2929
# Need feature in 1.11 for ffi.gc() to declare size of objects so we avoid
3030
# garbage collection pitfalls.
31-
MINIMUM_CFFI_VERSION = "1.11"
32-
33-
# Need 1.17+ on 3.13 to avoid deprecated and removed APIs.
34-
if sys.version_info[0:2] >= (3, 13):
35-
MINIMUM_CFFI_VERSION = "1.17"
31+
# Require 1.17 everywhere so we don't have to think about supporting older
32+
# versions.
33+
MINIMUM_CFFI_VERSION = "1.17"
3634

3735
ext_suffix = os.environ.get("SETUPTOOLS_EXT_SUFFIX")
3836
if ext_suffix:
3937
import sysconfig
38+
4039
# setuptools._distutils.command.build_ext doesn't use
4140
# SETUPTOOLS_EXT_SUFFIX like setuptools.command.build_ext does.
4241
# Work around the issue so that cross-compilation can work

0 commit comments

Comments
 (0)