Skip to content

Commit 92345d6

Browse files
committed
Integrate cffi-buildtool into CFFI itself
This adds code and documentation that was originally written by Rose Davidson (@inklesspen on GitHub) for the cffi-buildtool project: https://github.com/inklesspen/cffi-buildtool
1 parent 5285ae3 commit 92345d6

27 files changed

Lines changed: 964 additions & 105 deletions

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
CIBW_MUSLLINUX_X86_64_IMAGE: ${{ matrix.musllinux_img || 'musllinux_1_2' }}
183183
CIBW_MUSLLINUX_I686_IMAGE: ${{ matrix.musllinux_img || 'musllinux_1_2' }}
184184
CIBW_MUSLLINUX_AARCH64_IMAGE: ${{ matrix.musllinux_img || 'musllinux_1_2' }}
185-
CIBW_TEST_REQUIRES: pytest setuptools # 3.12+ no longer includes distutils, just always ensure setuptools is present
185+
CIBW_TEST_REQUIRES: pytest setuptools meson-python ninja # 3.12+ no longer includes distutils, just always ensure setuptools is present
186186
CIBW_TEST_COMMAND: PYTHONUNBUFFERED=1 python -m pytest ${{ matrix.test_args || '{project}' }} # default to test all
187187
run: |
188188
set -eux
@@ -268,7 +268,7 @@ jobs:
268268
id: build
269269
env:
270270
CIBW_BUILD: ${{ matrix.spec }}
271-
CIBW_TEST_REQUIRES: pytest setuptools
271+
CIBW_TEST_REQUIRES: pytest setuptools meson-python ninja
272272
CIBW_TEST_COMMAND: pip install pip --upgrade; cd {project}; PYTHONUNBUFFERED=1 pytest
273273
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.deployment_target || '10.13' }}
274274
SDKROOT: ${{ matrix.sdkroot || 'macosx' }}
@@ -351,7 +351,7 @@ jobs:
351351
id: build
352352
env:
353353
CIBW_BUILD: ${{ matrix.spec }}
354-
CIBW_TEST_REQUIRES: pytest setuptools
354+
CIBW_TEST_REQUIRES: pytest setuptools meson-python ninja
355355
CIBW_TEST_COMMAND: ${{ matrix.test_cmd || 'python -m pytest {package}/src/c' }}
356356
# FIXME: /testing takes ~45min on Windows and has some failures...
357357
# CIBW_TEST_COMMAND='python -m pytest {package}/src/c {package}/testing'
@@ -527,7 +527,7 @@ jobs:
527527

528528
- name: build and install
529529
run: |
530-
python -m pip install pytest setuptools pytest-run-parallel
530+
python -m pip install pytest setuptools meson-python ninja pytest-run-parallel
531531
python -m pip install .
532532
533533
- name: run tests under pytest-run-parallel
@@ -542,7 +542,7 @@ jobs:
542542

543543
- name: build and install
544544
run: |
545-
python -m pip install setuptools pytest pytest-run-parallel
545+
python -m pip install setuptools meson-python ninja pytest pytest-run-parallel
546546
CFLAGS="-g -O3 -fsanitize=thread" python -m pip install -v .
547547
548548
- name: run tests under pytest-run-parallel

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
recursive-include src/cffi *.py *.h
22
recursive-include src/c *.c *.h *.asm *.py win64.obj ffi.lib
3-
recursive-include testing *.py *.c *.h
3+
recursive-include testing *.py *.c *.h meson.build pyproject.toml *.txt
44
recursive-include doc *.py *.rst Makefile *.bat
55
recursive-include demo py.cleanup *.py embedding_test.c manual.c
66
include AUTHORS LICENSE setup.py setup_base.py

0 commit comments

Comments
 (0)