From bba65084eadca64776d520004ded10375ab5d30e Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 16 Oct 2021 17:18:05 -0400 Subject: [PATCH] Ban cffi version that makes CI sad (#6418) * Update installation for testing against bookworm * Try bumping macOS timeout * Try pinning cffi * Ban 1.15.0 --- .../wheel/roles/build-wheel-manylinux/files/build-wheels.sh | 2 +- docs/installation.rst | 4 ++-- pyproject.toml | 2 +- setup.cfg | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh b/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh index 216a83933..33327db49 100644 --- a/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh +++ b/.zuul.playbooks/playbooks/wheel/roles/build-wheel-manylinux/files/build-wheels.sh @@ -13,7 +13,7 @@ for P in ${PYTHONS}; do "${PYBIN}"/python -m venv .venv - .venv/bin/pip install -U pip wheel cffi setuptools-rust + .venv/bin/pip install -U pip wheel "cffi!=1.15.0" setuptools-rust REGEX="cp3([0-9])*" if [[ "${PYBIN}" =~ $REGEX ]]; then diff --git a/docs/installation.rst b/docs/installation.rst index 7737ed12f..77e6f306c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -22,8 +22,8 @@ operating systems. * x86-64 Ubuntu 18.04, 20.04 * AArch64 Ubuntu 20.04 * x86-64 Ubuntu rolling -* x86-64 Debian Stretch (9.x), Buster (10.x), Bullseye (11.x), and Sid - (unstable) +* x86-64 Debian Stretch (9.x), Buster (10.x), Bullseye (11.x), Bookworm (12.x) + and Sid (unstable) * x86-64 Alpine (latest) * 32-bit and 64-bit Python on 64-bit Windows Server 2019 diff --git a/pyproject.toml b/pyproject.toml index a942869cd..6c7224bc1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "setuptools>=40.6.0", "wheel", # Must be kept in sync with the `setup_requirements` in `setup.cfg` - "cffi>=1.12; platform_python_implementation != 'PyPy'", + "cffi>=1.12,!=1.15.0; platform_python_implementation != 'PyPy'", "setuptools-rust>=0.11.4", ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index de1eaf468..10853c275 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,9 +47,9 @@ ext_package = cryptography.hazmat.bindings # `install_requires` and `setup_requires` must be kept in sync with # `pyproject.toml` install_requires = - cffi >=1.12 + cffi>=1.12,!=1.15.0 setup_requires = - cffi >=1.12 + cffi>=1.12,!=1.15.0 setuptools_rust >= 0.11.4 [options.packages.find]