diff --git a/.cruft.json b/.cruft.json index eec12ac..111cd08 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/mkoeppe/sage", - "commit": "395ca6708b260eda0da376a1847260cf7c841ebd", + "commit": "efb7f3c3571532dfac58d5fab2326a45e1fc1370", "checkout": "sagemath-environment-cookiecutter", "context": { "cookiecutter": { diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 07ee1ee..f5014a7 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -24,7 +24,7 @@ jobs: run: | python3 -m pip install build python3 -m build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: "dist/*.tar.gz" name: dist @@ -48,10 +48,10 @@ jobs: arch: x86_64 - os: ubuntu-latest arch: i686 - - os: macos-latest - arch: auto + - os: macos-13 + arch: x86_64 - os: macos-14 - arch: auto + arch: arm64 env: # SPKGs to install as system packages SPKGS: _bootstrap _prereq @@ -74,7 +74,7 @@ jobs: repository: sagemath/sage ref: develop - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: dist path: dist @@ -101,18 +101,19 @@ jobs: mkdir -p unpacked for pkg in cysignals; do (cd unpacked && tar xfz - ) < dist/$pkg*.tar.gz - "${{ steps.python.outputs.python-path }}" -m pipx run cibuildwheel==2.17.0 unpacked/$pkg* + "${{ steps.python.outputs.python-path }}" -m pipx run cibuildwheel==2.18.0 unpacked/$pkg* done env: # on pp310: build/src/cysignals/implementation.c:231:9: error: implicit declaration of function 'PyPyErr_SetInterrupt' is invalid in C99 [-Werror,-Wimplicit-function-declaration] CIBW_SKIP: "pp31*" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: wheels + name: ${{ matrix.os }}-${{ matrix.arch }}-wheels path: ./wheelhouse/*.whl pypi-publish: + # This needs to be a separate job because pypa/gh-action-pypi-publish cannot run on macOS # https://github.com/pypa/gh-action-pypi-publish name: Upload wheels to PyPI needs: build_wheels @@ -122,10 +123,11 @@ jobs: CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }} steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: wheels + pattern: "*-*-wheels" path: wheelhouse + merge-multiple: true - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1