diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 6705bfbc38..f10c386723 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -45,22 +45,24 @@ jobs: MATRIX_PULL_REQUEST: | { "include": [ - {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-manylinux_*", "CIBW_ARCHS": "x86_64"}, - {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-musllinux_*", "CIBW_ARCHS": "x86_64"}, - {"os": "macos-12", "CIBW_BUILD": "cp39-*", "CIBW_ARCHS": "x86_64"}, - {"os": "windows-2022", "CIBW_BUILD": "cp39-*", "CIBW_ARCHS": "AMD64"} + {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-manylinux_x86_64"}, + {"os": "ubuntu-latest", "CIBW_BUILD": "cp39-musllinux_x86_64"}, + {"os": "macos-13", "CIBW_BUILD": "cp39-macosx_x86_64"}, + {"os": "macos-14", "CIBW_BUILD": "cp39-macosx_arm64"}, + {"os": "windows-latest", "CIBW_BUILD": "cp39-win_amd64"} ] } MATRIX_WORKFLOW_DISPATCH: | { "include": [ - {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_*", "CIBW_ARCHS": "x86_64"}, - {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_*", "CIBW_ARCHS": "aarch64"}, - {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_*", "CIBW_ARCHS": "x86_64"}, - {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_*", "CIBW_ARCHS": "aarch64"}, - {"os": "macos-12", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "x86_64"}, - {"os": "windows-2022", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "x86"}, - {"os": "windows-2022", "CIBW_BUILD": "cp*", "CIBW_ARCHS": "AMD64"} + {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_x86_64"}, + {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-manylinux_aarch64"}, + {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_x86_64"}, + {"os": "ubuntu-latest", "CIBW_BUILD": "cp*-musllinux_aarch64"}, + {"os": "macos-13", "CIBW_BUILD": "cp*-macosx_x86_64"}, + {"os": "macos-14", "CIBW_BUILD": "cp3*-macosx_arm64"}, + {"os": "windows-latest", "CIBW_BUILD": "cp*-win32"}, + {"os": "windows-latest", "CIBW_BUILD": "cp*-win_amd64"} ] } @@ -87,7 +89,9 @@ jobs: env: CIBW_BUILD_VERBOSITY: 1 CIBW_BUILD: ${{ matrix.CIBW_BUILD }} - CIBW_ARCHS: ${{ matrix.CIBW_ARCHS }} + CIBW_MANYLINUX_*_IMAGE: manylinux2014 + CIBW_MUSLLINUX_*_IMAGE: musllinux_1_2 + CIBW_SKIP: pp* CIBW_TEST_SKIP: "*-win32" steps: @@ -101,12 +105,12 @@ jobs: id: cache-wheel with: path: wheelhouse - key: wheel-${{ matrix.CIBW_BUILD }}-${{ matrix.CIBW_ARCHS }}-${{ github.sha }} + key: wheel-${{ matrix.os }}-${{ matrix.CIBW_BUILD }}-${{ github.sha }} - uses: docker/setup-qemu-action@v3 if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux' - - uses: pypa/cibuildwheel@v2.19.2 + - uses: pypa/cibuildwheel@v2.20.0 if: steps.cache-wheel.outputs.cache-hit != 'true' - uses: actions/upload-artifact@v3 @@ -128,8 +132,8 @@ jobs: - uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_API_TOKEN }} - packages_dir: wheelhouse - skip_existing: true + packages-dir: wheelhouse + skip-existing: true upload_pypi_test: needs: build_wheels @@ -145,6 +149,6 @@ jobs: - uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.TEST_PYPI_API_TOKEN }} - packages_dir: wheelhouse - skip_existing: true + packages-dir: wheelhouse + skip-existing: true repository_url: https://test.pypi.org/legacy/ diff --git a/pyproject.toml b/pyproject.toml index a31c5dd724..4d6529f35f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [project] -requires-python = ">=3.7" +requires-python = ">=3.9" [tool.cibuildwheel] skip = "{pp*,}" @@ -17,8 +17,8 @@ test-command = [ [tool.cibuildwheel.macos.environment] BOOST_BUILD_PATH = "/tmp/boost/tools/build" BOOST_ROOT = "/tmp/boost" -BOOST_VERSION = "1.81.0" -MACOSX_DEPLOYMENT_TARGET = "12" +BOOST_VERSION = "1.83.0" +MACOSX_DEPLOYMENT_TARGET = "14" PATH = "/tmp/boost:$PATH" [[tool.cibuildwheel.overrides]] @@ -38,7 +38,7 @@ test-command = [ [tool.cibuildwheel.overrides.environment] # sub-table of previous block! BOOST_BUILD_PATH = "/tmp/boost/tools/build" BOOST_ROOT = "/tmp/boost" -BOOST_VERSION = "1.81.0" +BOOST_VERSION = "1.83.0" PATH = "/usr/local/ccache/bin:/tmp/boost:$PATH" [[tool.cibuildwheel.overrides]] @@ -57,7 +57,7 @@ test-command = [ [tool.cibuildwheel.overrides.environment] # sub-table of previous block! BOOST_BUILD_PATH = "/tmp/boost/tools/build" BOOST_ROOT = "/tmp/boost" -BOOST_VERSION = "1.81.0" +BOOST_VERSION = "1.83.0" PATH = "/usr/lib/ccache/bin:/tmp/boost:$PATH" [[tool.cibuildwheel.overrides]] @@ -78,7 +78,7 @@ test-command = '''bash -c "cd '{project}/bindings/python' && python test.py"''' [tool.cibuildwheel.windows.environment] BOOST_BUILD_PATH = 'c:/boost/tools/build' BOOST_ROOT = 'c:/boost' -BOOST_VERSION = "1.81.0" +BOOST_VERSION = "1.83.0" PATH = 'c:/boost;$PATH' [tool.isort]