Skip to content

Commit 51b3b30

Browse files
author
Release Manager
committed
gh-40417: bump cibuildwheel version and various other versions these versions are old, so we bump them. Also add new pre-reqs to our Dockerfile. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #40417 Reported by: Dima Pasechnik Reviewer(s): Tobias Diez
2 parents 552aab6 + a53a2f4 commit 51b3b30

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/dist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ jobs:
260260
# Installing pipx follows the approach of https://github.com/pypa/cibuildwheel/pull/1743
261261
id: python
262262
with:
263-
python-version: "3.8 - 3.12"
263+
python-version: "3.11 - 3.13"
264264
update-environment: false
265265

266266
- name: Bootstrap
@@ -283,7 +283,7 @@ jobs:
283283
#
284284
# omit sagemath-{meataxe,sirocco} for now -- needs sagemath-modules
285285
run: |
286-
"${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==2.18.0
286+
"${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==3.0.1
287287
export PATH=build/bin:$PATH
288288
echo CIBW_BEFORE_ALL="( $(sage-print-system-package-command debian --yes --no-install-recommends install $(sage-get-system-packages debian $SPKGS)) || $(sage-print-system-package-command fedora --yes --no-install-recommends install $(sage-get-system-packages fedora $SPKGS | sed s/pkg-config/pkgconfig/)) || ( $(sage-print-system-package-command homebrew --yes --no-install-recommends install $(sage-get-system-packages homebrew $SPKGS)) || $(sage-print-system-package-command alpine --yes --no-install-recommends install $(sage-get-system-packages alpine $SPKGS)) || echo error ignored) ) && if cp /host/sage-\$AUDITWHEEL_PLAT/config.status . 2>/dev/null; then chmod +x config.status; fi && if [ -x ./config.status ]; then ./config.status; else ./configure --enable-build-as-root ${{ startsWith(matrix.os, 'ubuntu') && '--prefix=/host/sage-\$AUDITWHEEL_PLAT' || '' }} && cp config.status prefix/; fi && MAKE=\"make -j6\" make V=0 $TARGETS_PRE && (echo \"sage_conf @ file://\$(pwd)/pkgs/sage-conf\" && echo \"sage_setup @ file://\$(pwd)/pkgs/sage-setup\") > constraints.txt" >> "$GITHUB_ENV"
289289
mkdir -p unpacked

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ RUN ln -s /usr/bin/sage /usr/bin/sagemath
9090
# We need gcc/g++ and libstdc++-10-dev to allow compilation of cython at run-time from the notebook.
9191
# We also install sudo for the sage user, see below.
9292
RUN apt-get -qq update \
93-
&& apt-get -qq install -y --no-install-recommends gfortran gcc g++ libstdc++-10-dev sudo openssl \
93+
&& apt-get -qq install -y --no-install-recommends gfortran gcc g++ libstdc++-10-dev sudo openssl bzip2 libbz2-dev pkg-config\
9494
&& apt-get -qq clean \
9595
&& rm -r /var/lib/apt/lists/*
9696
# Sage refuses to build as root, so we add a "sage" user that can sudo without a password.

0 commit comments

Comments
 (0)