diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58c2680..44c3d14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: enable-cache: false - name: Build wheels - uses: pypa/cibuildwheel@v2.23 + uses: pypa/cibuildwheel@v3.0 env: CIBW_ARCHS: "${{ matrix.arch }}" @@ -114,11 +114,11 @@ jobs: test_sdist: name: Test SDist with python ${{ matrix.python }} needs: [build_sdist] - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: - python: ["3.7", "3.12"] + python: ["3.8", "3.13"] steps: - uses: actions/checkout@v4 @@ -132,7 +132,6 @@ jobs: - uses: astral-sh/setup-uv@v6 with: enable-cache: false - version: "0.6.17" - name: Setup environment run: | diff --git a/pyproject.toml b/pyproject.toml index 25ee734..61b1988 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ classifiers = [ "Topic :: Software Development :: Build Tools", "Typing :: Typed", ] -requires-python = ">=3.7" +requires-python = ">=3.8" [project.urls] "Bug Tracker" = "https://github.com/scikit-build/ninja-python-distributions/issues" @@ -91,13 +91,20 @@ build-verbosity = 1 test-groups = "test" test-command = "pytest {project}/tests" test-skip = ["*-win_arm64", "*-macosx_universal2:arm64"] +archs = ["auto64", "auto32"] environment = { NINJA_PYTHON_DIST_ALLOW_NINJA_DEP = "1" } environment-pass = ["SETUPTOOLS_SCM_PRETEND_VERSION"] -musllinux-x86_64-image = "musllinux_1_1" -musllinux-i686-image = "musllinux_1_1" -musllinux-aarch64-image = "musllinux_1_1" -musllinux-ppc64le-image = "musllinux_1_1" -musllinux-s390x-image = "musllinux_1_1" +manylinux-x86_64-image = "manylinux2014" +manylinux-i686-image = "manylinux2014" +manylinux-aarch64-image = "manylinux2014" +manylinux-ppc64le-image = "manylinux2014" +manylinux-s390x-image = "manylinux2014" +manylinux-armv7l-image = "manylinux_2_31" +musllinux-x86_64-image = "musllinux_1_2" +musllinux-i686-image = "musllinux_1_2" +musllinux-aarch64-image = "musllinux_1_2" +musllinux-ppc64le-image = "musllinux_1_2" +musllinux-s390x-image = "musllinux_1_2" musllinux-armv7l-image = "musllinux_1_2" [tool.cibuildwheel.config-settings] @@ -112,24 +119,14 @@ select = "*-macos*" inherit.environment = "append" environment = { MACOSX_DEPLOYMENT_TARGET = "10.9" } -[[tool.cibuildwheel.overrides]] -select = "*-manylinux_{x86_64,i686}" -manylinux-x86_64-image = "manylinux2010" -manylinux-i686-image = "manylinux2010" -build-frontend = "pip" -inherit.environment = "append" -environment = { LDFLAGS = "-static-libstdc++" } -inherit.test-command = "prepend" -test-command = "pip check" - [[tool.cibuildwheel.overrides]] select = "*-musllinux_*" inherit.environment = "append" environment = { LDFLAGS = "-static-libstdc++ -static-libgcc" } [[tool.cibuildwheel.overrides]] -select = "*-musllinux_s390x" -build-frontend = "pip" +select = "*-musllinux_{ppc64le,s390x}" +build-frontend = "pip" # uv not available inherit.test-command = "prepend" inherit.config-settings = "append" test-command = "pip check"