Skip to content

Commit ff56508

Browse files
ci: upgrade cibuildwheel==3.1.4 (#14410)
Required for Python 3.14 The one **major** change here is auditwheel will now add multiple platform tags to the wheels, so we are getting wheel names like `-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl`, but this should be fine, just need to make sure our pipelines all support it (microbenchmarks didn't). ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [ ] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --------- Co-authored-by: Taegyun Kim <[email protected]>
1 parent bbba80e commit ff56508

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/build_python_3.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ jobs:
2525
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2626
with:
2727
python-version: "3.13"
28-
- run: pip install cibuildwheel==2.23.3
28+
- run: pip install cibuildwheel==3.1.4
2929
- id: set-matrix
3030
env:
3131
CIBW_BUILD: ${{ inputs.cibw_build }}
3232
run: |
3333
MATRIX_INCLUDE=$(
3434
{
35-
cibuildwheel --print-build-identifiers --platform linux --arch x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
36-
&& cibuildwheel --print-build-identifiers --platform linux --arch aarch64 | jq -cR '{only: ., os: "ubuntu-24.04-arm"}' \
37-
&& cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | jq -cR '{only: ., os: "windows-latest"}' \
38-
&& cibuildwheel --print-build-identifiers --platform macos --arch x86_64 | jq -cR '{only: ., os: "macos-13"}' \
39-
&& cibuildwheel --print-build-identifiers --platform macos --arch arm64 | jq -cR '{only: ., os: "macos-latest"}'
35+
cibuildwheel --print-build-identifiers --platform linux --archs x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
36+
&& cibuildwheel --print-build-identifiers --platform linux --archs aarch64 | jq -cR '{only: ., os: "ubuntu-24.04-arm"}' \
37+
&& cibuildwheel --print-build-identifiers --platform windows --archs AMD64,x86 | jq -cR '{only: ., os: "windows-latest"}' \
38+
&& cibuildwheel --print-build-identifiers --platform macos --archs x86_64 | jq -cR '{only: ., os: "macos-13"}' \
39+
&& cibuildwheel --print-build-identifiers --platform macos --archs arm64 | jq -cR '{only: ., os: "macos-latest"}'
4040
} | jq -sc
4141
)
4242
echo $MATRIX_INCLUDE
@@ -53,6 +53,8 @@ jobs:
5353
env:
5454
CIBW_SKIP: ${{ inputs.cibw_skip }}
5555
CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
56+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
57+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
5658
CIBW_MUSLLINUX_I686_IMAGE: ghcr.io/datadog/dd-trace-py/pypa_musllinux_1_2_i686:latest
5759
CIBW_BEFORE_ALL_WINDOWS: rustup target add i686-pc-windows-msvc
5860
CIBW_BEFORE_ALL_MACOS: rustup target add aarch64-apple-darwin
@@ -99,7 +101,7 @@ jobs:
99101
platforms: all
100102

101103
- name: Build wheels
102-
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3
104+
uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
103105
with:
104106
only: ${{ matrix.only }}
105107

.gitlab/benchmarks/microbenchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ candidate:
127127
- pipeline: $PARENT_PIPELINE_ID
128128
job: download_ddtrace_artifacts
129129
script: |
130-
cp pywheels/*-cp39-cp39-manylinux_*_x86_64*.whl ./
130+
cp pywheels/*-cp39-cp39-manylinux*_x86_64*.whl ./
131131
echo "CANDIDATE_WHL=$(ls *.whl | head -n 1)" | tee candidate.env
132132
echo "CANDIDATE_BRANCH=${CI_COMMIT_REF_NAME}" | tee -a candidate.env
133133
echo "CANDIDATE_COMMIT_SHA=${CI_COMMIT_SHA}" | tee -a candidate.env

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ def build_extension_cmake(self, ext: "CMakeExtension") -> None:
614614
cmake_args += [
615615
"-S{}".format(ext.source_dir), # cmake>=3.13
616616
"-B{}".format(cmake_build_dir), # cmake>=3.13
617-
"-DPython3_ROOT_DIR={}".format(sysconfig.get_config_var("prefix")),
617+
"-DPython3_ROOT_DIR={}".format(sys.prefix),
618618
"-DPYTHON_EXECUTABLE={}".format(sys.executable),
619619
"-DCMAKE_BUILD_TYPE={}".format(ext.build_type),
620620
"-DLIB_INSTALL_DIR={}".format(output_dir),

0 commit comments

Comments
 (0)