Skip to content

Commit 3eea0f7

Browse files
authored
Switch extension building to setuptools (#23)
This was never an officially supported poetry use-case, even though it was nice to have consistent locking. Other more modern/nicer solutions don't seem to handle extensions without added complication (e.g. hatchling is nice, but unless you already use cmake or cython only, this seems to fall between the gaps a little), so just use plain setuptools.
1 parent feef3ff commit 3eea0f7

18 files changed

+5867
-6116
lines changed

.github/workflows/build_wheels.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Apply patches
2222
run: cat $(ls patches/*.patch | sort) | patch -p1 -N
2323
- name: Build sdist
24-
run: pipx run poetry build -f sdist
24+
run: pip3 install build && python3 -m build -s .
2525

2626
- uses: actions/upload-artifact@v4
2727
with:
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ${{ matrix.os }}
3535
strategy:
3636
matrix:
37-
os: [ubuntu-20.04, macos-10.15, windows-2019]
37+
os: [ubuntu-latest, macos-latest, windows-latest]
3838

3939
steps:
4040
- uses: actions/download-artifact@v4
@@ -47,16 +47,16 @@ jobs:
4747
- name: Decompress sdist
4848
if: "! startsWith(matrix.os, 'windows-')"
4949
run: tar --strip-components=1 -xf dist/*.tar.gz
50-
5150
- name: Build wheel
52-
uses: joerick/cibuildwheel@v1.11.0
51+
uses: pypa/cibuildwheel@v2.22.0
5352
env:
54-
CIBW_SKIP: cp2* cp35* pp*
53+
CIBW_SKIP: cp36* cp37* pp* cp313* *musllinux*
5554
CIBW_TEST_COMMAND: pytest --regression {package}/tests
5655
CIBW_BEFORE_TEST: pip install pytest dials-data
5756

5857
- uses: actions/upload-artifact@v4
5958
with:
59+
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
6060
path: ./wheelhouse/*.whl
6161

6262
upload_pypi:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
setup.py
21
.vscode/
32

43
# Byte-compiled / optimized / DLL files

MANIFEST.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
include cbflib/src/*.c
2+
include cbflib/include/*.h
3+
include pycbf_wrap.c
4+
include src/**/*.pyx
5+
include src/**/*.pxd
6+
include src/**/*.pyi
7+
8+

build_multiple_wheels.sh

Lines changed: 0 additions & 78 deletions
This file was deleted.

newsfragments/23.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Switch to setuptools extension building.

0 commit comments

Comments
 (0)