Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch extension building to setuptools #23

Merged
merged 34 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c1ad9da
Switch to plain setuptools/Cython, prepare for regenerate
ndevenish Sep 11, 2024
f5bf19a
Regenerate SWIG bindings
ndevenish Sep 11, 2024
4784831
Regenerate again
ndevenish Sep 11, 2024
beb360d
Remvoe extra_data override
ndevenish Sep 13, 2024
5a39a74
Handle skipped patches on macos
ndevenish Sep 13, 2024
97a8d16
Add news
ndevenish Sep 13, 2024
6c6dc69
Clean pyproject, add MANIFEST.in
ndevenish Sep 13, 2024
72bffca
Commit requirements files
ndevenish Sep 13, 2024
062a47a
Rename newsfragments/XXX.misc to newsfragments/23.misc
DiamondLightSource-build-server Sep 13, 2024
ec87981
Merge branch 'main' into setup
ndevenish Sep 13, 2024
a422760
Use python-build
ndevenish Sep 13, 2024
979cefa
Update cibuildwheel
ndevenish Sep 13, 2024
295dceb
Bump
ndevenish Jan 9, 2025
f4aec17
Update cibuildhwheel
ndevenish Jan 9, 2025
85ba2b8
Diagnostics
ndevenish Jan 9, 2025
7ea2f31
Try removing this
ndevenish Jan 9, 2025
186e63a
Pip verbose
ndevenish Jan 9, 2025
a22a5fd
Test diagnostics
ndevenish Jan 9, 2025
267fdcc
test
ndevenish Jan 9, 2025
221b964
Test
ndevenish Jan 9, 2025
953021f
Skip test
ndevenish Jan 9, 2025
bd77dc2
Skip python 3.13 for test
ndevenish Jan 9, 2025
77d7f17
cibuildwheel now builds musllinux
ndevenish Jan 9, 2025
897ea28
Re-disable test
ndevenish Jan 9, 2025
9490f82
Skip 3.6, re-enable tests
ndevenish Jan 9, 2025
3ea50cf
Skip 3.7, as urllib 3 errors
ndevenish Jan 9, 2025
e8e1490
Cibuildwheel no longer builds 2
ndevenish Jan 9, 2025
5b26126
Remove output test
ndevenish Jan 9, 2025
8ddd710
Don't separate out sdist and build
ndevenish Jan 9, 2025
19e4b0d
Patching needs to happen before windows
ndevenish Jan 9, 2025
ac77974
Rename sdist artifact
ndevenish Jan 9, 2025
55ad0cd
Switch to recommended cibuildwheel naming
ndevenish Jan 9, 2025
07409a9
Undo rename
ndevenish Jan 10, 2025
7eb37fd
Update runner images
ndevenish Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Apply patches
run: cat $(ls patches/*.patch | sort) | patch -p1 -N
- name: Build sdist
run: pipx run poetry build -f sdist
run: pip3 install build && python3 -m build -s .

- uses: actions/upload-artifact@v4
with:
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, macos-10.15, windows-2019]
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
- uses: actions/download-artifact@v4
Expand All @@ -47,16 +47,16 @@ jobs:
- name: Decompress sdist
if: "! startsWith(matrix.os, 'windows-')"
run: tar --strip-components=1 -xf dist/*.tar.gz

- name: Build wheel
uses: joerick/cibuildwheel@v1.11.0
uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_SKIP: cp2* cp35* pp*
CIBW_SKIP: cp36* cp37* pp* cp313* *musllinux*
CIBW_TEST_COMMAND: pytest --regression {package}/tests
CIBW_BEFORE_TEST: pip install pytest dials-data

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

upload_pypi:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
setup.py
.vscode/

# Byte-compiled / optimized / DLL files
Expand Down
8 changes: 8 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
include cbflib/src/*.c
include cbflib/include/*.h
include pycbf_wrap.c
include src/**/*.pyx
include src/**/*.pxd
include src/**/*.pyi


78 changes: 0 additions & 78 deletions build_multiple_wheels.sh

This file was deleted.

1 change: 1 addition & 0 deletions newsfragments/23.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch to setuptools extension building.
Loading
Loading