Skip to content

Commit ec3d5ac

Browse files
committed
Update cffi support
1 parent f5767dc commit ec3d5ac

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

Diff for: .github/workflows/tests.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
125125
126126
- name: pip cache
127-
uses: actions/cache@v3
127+
uses: actions/cache@v4
128128
with:
129129
path: ${{ steps.pip-cache.outputs.dir }}
130130
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -138,7 +138,8 @@ jobs:
138138
pip install -U setuptools wheel twine
139139
# cffi will probably have no public release until a Python 3.13 beta
140140
# or even RC release, see https://github.com/python-cffi/cffi/issues/23
141-
pip install -U "cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip"
141+
echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt
142+
PIP_CONSTRAINT=cffi_constraint.txt pip install cffi
142143
# twine has no release for 3.13, yet, see https://github.com/pypa/twine/issues/1030
143144
pip install -U "git+https://github.com/pypa/twine.git#egg=twine"
144145
- name: Install Build Dependencies
@@ -190,9 +191,12 @@ jobs:
190191
if: matrix.python-version == '3.13.0-alpha - 3.13.0'
191192
run: |
192193
# Install to collect dependencies into the (pip) cache.
194+
# cffi will probably have no public release until a Python 3.13 beta
195+
# or even RC release, see https://github.com/python-cffi/cffi/issues/23
196+
echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt
193197
# Use "--pre" here because dependencies with support for this future
194198
# Python release may only be available as pre-releases
195-
pip install --pre .[test]
199+
PIP_CONSTRAINT=cffi_constraint.txt pip install --pre .[test]
196200
- name: Install AccessControl and dependencies
197201
if: matrix.python-version != '3.13.0-alpha - 3.13.0'
198202
run: |
@@ -279,7 +283,7 @@ jobs:
279283
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
280284
281285
- name: pip cache
282-
uses: actions/cache@v3
286+
uses: actions/cache@v4
283287
with:
284288
path: ${{ steps.pip-cache.outputs.dir }}
285289
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -297,17 +301,17 @@ jobs:
297301
pip install -U wheel setuptools
298302
# cffi will probably have no public release until a beta or even RC
299303
# version of Python 3.13, see https://github.com/python-cffi/cffi/issues/23
300-
pip install -U 'cffi @ https://github.com/python-cffi/cffi/archive/refs/heads/main.zip ; platform_python_implementation == "CPython"'
304+
echo 'cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58 ; platform_python_implementation == "CPython"' > cffi_constraint.txt
301305
# coverage has a wheel on PyPI for a future python version which is
302306
# not ABI compatible with the current one, so build it from sdist:
303307
pip install -U --no-binary :all: coverage
304308
# Unzip into src/ so that testrunner can find the .so files
305309
# when we ask it to load tests from that directory. This
306310
# might also save some build time?
307-
unzip -n dist/AccessControl-*whl -d src
311+
unzip -n dist/zope.index-*whl -d src
308312
# Use "--pre" here because dependencies with support for this future
309313
# Python release may only be available as pre-releases
310-
pip install --pre -U -e .[test]
314+
PIP_CONSTRAINT=cffi_constraint.txt pip install --pre -U -e .[test]
311315
- name: Install AccessControl
312316
if: ${{ !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }}
313317
run: |
@@ -374,7 +378,7 @@ jobs:
374378
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
375379
376380
- name: pip cache
377-
uses: actions/cache@v3
381+
uses: actions/cache@v4
378382
with:
379383
path: ${{ steps.pip-cache.outputs.dir }}
380384
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -427,7 +431,7 @@ jobs:
427431
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
428432
429433
- name: pip cache
430-
uses: actions/cache@v3
434+
uses: actions/cache@v4
431435
with:
432436
path: ${{ steps.pip-cache.outputs.dir }}
433437
key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }}

Diff for: .meta.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/c-code
33
[meta]
44
template = "c-code"
5-
commit-id = "e45966cd"
5+
commit-id = "d3005188"
66

77
[python]
88
with-appveyor = true

0 commit comments

Comments
 (0)