diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 4ef4587d648..f8ad72c19b5 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -260,7 +260,7 @@ jobs: # Installing pipx follows the approach of https://github.com/pypa/cibuildwheel/pull/1743 id: python with: - python-version: "3.8 - 3.12" + python-version: "3.11 - 3.13" update-environment: false - name: Bootstrap @@ -283,7 +283,7 @@ jobs: # # omit sagemath-{meataxe,sirocco} for now -- needs sagemath-modules run: | - "${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==2.18.0 + "${{ steps.python.outputs.python-path }}" -m pip install cibuildwheel==3.0.1 export PATH=build/bin:$PATH 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" mkdir -p unpacked diff --git a/docker/Dockerfile b/docker/Dockerfile index d60a8b05c72..101f50b5860 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -90,7 +90,7 @@ RUN ln -s /usr/bin/sage /usr/bin/sagemath # We need gcc/g++ and libstdc++-10-dev to allow compilation of cython at run-time from the notebook. # We also install sudo for the sage user, see below. RUN apt-get -qq update \ - && apt-get -qq install -y --no-install-recommends gfortran gcc g++ libstdc++-10-dev sudo openssl \ + && apt-get -qq install -y --no-install-recommends gfortran gcc g++ libstdc++-10-dev sudo openssl bzip2 libbz2-dev pkg-config\ && apt-get -qq clean \ && rm -r /var/lib/apt/lists/* # Sage refuses to build as root, so we add a "sage" user that can sudo without a password.