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.

Sign up for GitHub

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

Jump to bottom

Switch extension building to setuptools #23

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Switch extension building to setuptools #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 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
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
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels.yml
View file
Open in desktop
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 Down Expand Up @@ -49,7 +49,7 @@ jobs:
run: tar --strip-components=1 -xf dist/*.tar.gz

- name: Build wheel
uses: joerick/cibuildwheel@v1.11.0
uses: joerick/cibuildwheel@v2.20.0
env:
CIBW_SKIP: cp2* cp35* pp*
CIBW_TEST_COMMAND: pytest --regression {package}/tests
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
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
View file
Open in desktop
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


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