Skip to content

Commit 131e21f

Browse files
Merge pull request #198 from DiamondLightSource/ci_fixes
Python 3.13 and Windows CI fixes
2 parents 102800c + 124c6ca commit 131e21f

4 files changed

Lines changed: 688 additions & 557 deletions

File tree

.github/workflows/code.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
os: [ubuntu-latest, windows-latest, macos-15-intel]
57-
python: [cp37, cp38, cp39, cp310, cp311, cp312]
57+
python: [cp37, cp38, cp39, cp310, cp311, cp312, cp313]
5858

5959

6060
include:
@@ -71,6 +71,12 @@ jobs:
7171
cov_file: /output/coverage.xml
7272
results_file: /output/pytest-results.xml
7373

74+
exclude:
75+
# Exclude Windows + Python 3.9 as p4p can't build there, due to numpy bug #27224
76+
# which was never ported back to the 2.0.* numpy release stream.
77+
- os: windows-latest
78+
python: cp39
79+
7480
name: build/${{ matrix.os }}/${{ matrix.python }}
7581
runs-on: ${{ matrix.os }}
7682

@@ -90,7 +96,12 @@ jobs:
9096
- name: Install Python Dependencies
9197
# cibuildwheel 3.0.0 dropped support for Python 3.7. We still want to
9298
# support 3.7 for the time being.
93-
run: pip install build cibuildwheel==2.23.3
99+
# Python 3.14 isn't supported on lower versions of cibuildwheel, so conditionally install when required
100+
run: |
101+
pip install build
102+
[ ${{matrix.python }} == "cp314" ] && pip install cibuildwheel || pip install cibuildwheel==2.23.3
103+
pip freeze
104+
shell: bash
94105

95106
- name: Build Wheel
96107
run: cibuildwheel --output-dir dist
@@ -129,7 +140,13 @@ jobs:
129140
fail-fast: false
130141
matrix:
131142
os: [ubuntu-latest, windows-latest, macos-15-intel]
132-
python: [cp37, cp38, cp39, cp310, cp311, cp312]
143+
python: [cp37, cp38, cp39, cp310, cp311, cp312, cp313]
144+
145+
exclude:
146+
# Exclude Windows + Python 3.9 as p4p can't build there, due to numpy bug #27224
147+
# which was never ported back to the 2.0.* numpy release stream.
148+
- os: windows-latest
149+
python: cp39
133150

134151
runs-on: ${{ matrix.os }}
135152

0 commit comments

Comments
 (0)