From 3a12a35b8da71c646a9fb506b69408a077e28c41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 04:24:37 +0000 Subject: [PATCH 1/6] chore(deps): bump pypa/cibuildwheel in the actions group Bumps the actions group with 1 update: [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel). Updates `pypa/cibuildwheel` from 2.23 to 3.0 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.23...v3.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-version: '3.0' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58c2680..6ba0e82 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 }}" From 16b4564c6798056b152feb0ec764628d2a193db9 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 19 Jun 2025 12:16:53 -0400 Subject: [PATCH 2/6] fix: keep old defaults Signed-off-by: Henry Schreiner --- pyproject.toml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 25ee734..edf0c85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,12 +93,15 @@ test-command = "pytest {project}/tests" test-skip = ["*-win_arm64", "*-macosx_universal2:arm64"] 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" -musllinux-armv7l-image = "musllinux_1_2" +manylinux-x86_64-image = "quay.io/pypa/manylinux2010_x86_64:latest" +manylinux-i686-image = "quay.io/pypa/manylinux2010_i686:latest" +manylinux-pypy_x86_64-image = "manylinux2014" +manylinux-aarch64-image = "manylinux2014" +musllinux-x86_64-image = "quay.io/pypa/musllinux_1_1_x86_64:latest" +musllinux-i686-image = "quay.io/pypa/musllinux_1_1_i686:latest" +musllinux-aarch64-image = "quay.io/pypa/musllinux_1_1_aarch64:latest" +musllinux-ppc64le-image = "quay.io/pypa/musllinux_1_1_ppc64le:latest" +musllinux-s390x-image = "quay.io/pypa/musllinux_1_1_s390x:latest" [tool.cibuildwheel.config-settings] "cmake.define.RUN_NINJA_TEST" = "ON" @@ -114,8 +117,6 @@ 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++" } From efb5ed4cdabd1ce7fc40ce6d6c0a80adf719cd6f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 20 Jun 2025 10:53:06 -0400 Subject: [PATCH 3/6] Update pyproject.toml --- pyproject.toml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index edf0c85..2b9ef73 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,17 +91,18 @@ 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"] -manylinux-x86_64-image = "quay.io/pypa/manylinux2010_x86_64:latest" -manylinux-i686-image = "quay.io/pypa/manylinux2010_i686:latest" +manylinux-x86_64-image = "manylinux2014" +manylinux-i686-image = "manylinux2014" manylinux-pypy_x86_64-image = "manylinux2014" manylinux-aarch64-image = "manylinux2014" -musllinux-x86_64-image = "quay.io/pypa/musllinux_1_1_x86_64:latest" -musllinux-i686-image = "quay.io/pypa/musllinux_1_1_i686:latest" -musllinux-aarch64-image = "quay.io/pypa/musllinux_1_1_aarch64:latest" -musllinux-ppc64le-image = "quay.io/pypa/musllinux_1_1_ppc64le:latest" -musllinux-s390x-image = "quay.io/pypa/musllinux_1_1_s390x:latest" +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" [tool.cibuildwheel.config-settings] "cmake.define.RUN_NINJA_TEST" = "ON" From 1060677c9fab406830d4f9d093048cecad662cc9 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 20 Jun 2025 10:54:00 -0400 Subject: [PATCH 4/6] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ba0e82..44c3d14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | From 04264d2571ec3e83e31f355d6c7c6c010798f5cc Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 28 Jun 2025 10:11:40 +0200 Subject: [PATCH 5/6] Update pyproject.toml --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2b9ef73..57c30f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,13 +96,15 @@ environment = { NINJA_PYTHON_DIST_ALLOW_NINJA_DEP = "1" } environment-pass = ["SETUPTOOLS_SCM_PRETEND_VERSION"] manylinux-x86_64-image = "manylinux2014" manylinux-i686-image = "manylinux2014" -manylinux-pypy_x86_64-image = "manylinux2014" manylinux-aarch64-image = "manylinux2014" +manylinux-ppc64le-image = "manylinux2014" +manylinux-s390x-image = "manylinux2014" 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] "cmake.define.RUN_NINJA_TEST" = "ON" From 3889a2e0eb8de685492b5937a22d463ade0cbbab Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 28 Jun 2025 11:07:46 +0200 Subject: [PATCH 6/6] Update pyproject.toml --- pyproject.toml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 57c30f6..61b1988 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,6 +99,7 @@ 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" @@ -118,22 +119,14 @@ select = "*-macos*" inherit.environment = "append" environment = { MACOSX_DEPLOYMENT_TARGET = "10.9" } -[[tool.cibuildwheel.overrides]] -select = "*-manylinux_{x86_64,i686}" -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"