Skip to content

Commit ae8905a

Browse files
mayeuthenryiii
mayeut
and
henryiii
authored
break: drop Python 3.7, manylinux2010 & musllinux_1_1 (#616)
* break: drop Python 3.7, manylinux2010 & musllinux_1_1 * Latest release of uv broke Python <3.10, so use 3.10 * Update build.yml --------- Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
1 parent b1e4d5f commit ae8905a

File tree

5 files changed

+21
-61
lines changed

5 files changed

+21
-61
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -137,44 +137,14 @@ jobs:
137137
if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
138138
env:
139139
CIBW_ARCHS: "${{ matrix.arch }}"
140-
CIBW_BUILD: "cp39-${{ matrix.build }}*"
140+
CIBW_BUILD: "cp310-${{ matrix.build }}*"
141141

142142
- uses: actions/upload-artifact@v4
143143
if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
144144
with:
145145
name: cibw-${{ runner.os }}-${{ matrix.build }}${{ matrix.arch }}
146146
path: ./wheelhouse/*.whl
147147

148-
build_manylinux2010_wheels:
149-
name: Build ${{ matrix.arch }} manylinux2010 wheels
150-
needs: [lint]
151-
runs-on: ubuntu-latest
152-
strategy:
153-
fail-fast: false
154-
matrix:
155-
include:
156-
- arch: "x86_64"
157-
- arch: "i686"
158-
159-
steps:
160-
- uses: actions/checkout@v4
161-
with:
162-
fetch-depth: 0 # required for versioneer to find tags
163-
164-
- name: Build wheels
165-
uses: pypa/cibuildwheel@v3.1
166-
env:
167-
CIBW_ARCHS: "${{ matrix.arch }}"
168-
CIBW_BUILD: "cp39-manylinux_*"
169-
CIBW_MANYLINUX_X86_64_IMAGE: "quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177"
170-
CIBW_MANYLINUX_I686_IMAGE: "quay.io/pypa/manylinux2010_i686:2022-08-05-4535177"
171-
CIBW_BUILD_FRONTEND: "build"
172-
173-
- uses: actions/upload-artifact@v4
174-
with:
175-
name: cibw-manylinux2010-${{ matrix.arch }}
176-
path: ./wheelhouse/*.whl
177-
178148
build_sdist:
179149
name: Build source distribution
180150
needs: [lint]
@@ -290,7 +260,7 @@ jobs:
290260

291261
check_dist:
292262
name: Check dist
293-
needs: [build_wheels, build_manylinux2010_wheels, build_sdist, test_sdist, bootstrap_build]
263+
needs: [build_wheels, build_sdist, test_sdist, bootstrap_build]
294264
runs-on: ubuntu-latest
295265
steps:
296266
- uses: actions/download-artifact@v4

‎README.rst‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@ The following platforms are supported with binary wheels:
5252
| Windows | | 64-bit |
5353
| | | 32-bit |
5454
+---------------+---------------------------+
55-
| Linux Intel | | manylinux2010+ x86_64 |
56-
| | | musllinux_1_1+ x86_64 |
57-
| | | manylinux2010+ i686 |
58-
| | | musllinux_1_1+ i686 |
55+
| Linux Intel | | manylinux2014+ x86_64 |
56+
| | | musllinux_1_2+ x86_64 |
57+
| | | manylinux2014+ i686 |
58+
| | | musllinux_1_2+ i686 |
5959
+---------------+---------------------------+
6060
| Linux ARM | | manylinux2014+ AArch64 |
61-
| | | musllinux_1_1+ AArch64 |
61+
| | | musllinux_1_2+ AArch64 |
6262
| | | manylinux_2_31+ armv7l |
6363
| | | musllinux_1_2+ armv7l |
6464
+---------------+---------------------------+
6565
| Linux PowerPC | | manylinux2014+ ppc64le |
66-
| | | musllinux_1_1+ ppc64le |
66+
| | | musllinux_1_2+ ppc64le |
6767
+---------------+---------------------------+
6868
| Linux IBM Z | | manylinux2014+ s390x |
69-
| | | musllinux_1_1+ s390x |
69+
| | | musllinux_1_2+ s390x |
7070
+---------------+---------------------------+
7171
| Linux RISC-V | | manylinux_2_35+ riscv64 |
7272
| | | musllinux_1_2+ riscv64 |
@@ -77,6 +77,7 @@ The following platforms are supported with binary wheels:
7777
+---------------+---------------------------+
7878

7979
The last version to provide ``manylinux1`` wheels was ``3.22.x``.
80+
The last version to provide Python 3.7 support and ``manylinux2010`` wheels was ``4.0.3``.
8081
The last version to provide Python 2 to Python 3.6 support was ``3.28.x``.
8182

8283
Maintainers

‎pyproject.toml‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ classifiers = [
2626
"Topic :: Software Development :: Build Tools",
2727
"Typing :: Typed"
2828
]
29-
dependencies = [
30-
"importlib_metadata>=1.4; python_version<'3.8'",
31-
]
32-
requires-python = ">=3.7"
29+
requires-python = ">=3.8"
3330

3431
[project.urls]
3532
Homepage = "https://cmake.org"
@@ -95,7 +92,7 @@ testpaths = ["tests"]
9592

9693
[tool.cibuildwheel]
9794
archs = ["auto64", "auto32"]
98-
build = "cp39-*"
95+
build = "cp310-*"
9996
test-groups = ["test"]
10097
test-command = "pytest {project}/tests"
10198
build-verbosity = 1
@@ -109,11 +106,11 @@ manylinux-ppc64le-image = "manylinux2014"
109106
manylinux-s390x-image = "manylinux2014"
110107
manylinux-armv7l-image = "manylinux_2_31"
111108
manylinux-riscv64-image = "ghcr.io/mayeut/manylinux_2_35:2025.08.02-2"
112-
musllinux-x86_64-image = "quay.io/pypa/musllinux_1_1_x86_64:2024.10.26-1"
113-
musllinux-i686-image = "quay.io/pypa/musllinux_1_1_i686:2024.10.26-1"
114-
musllinux-aarch64-image = "quay.io/pypa/musllinux_1_1_aarch64:2024.10.26-1"
115-
musllinux-ppc64le-image = "quay.io/pypa/musllinux_1_1_ppc64le:2024.10.26-1"
116-
musllinux-s390x-image = "quay.io/pypa/musllinux_1_1_s390x:2024.10.26-1"
109+
musllinux-x86_64-image = "musllinux_1_2"
110+
musllinux-i686-image = "musllinux_1_2"
111+
musllinux-aarch64-image = "musllinux_1_2"
112+
musllinux-ppc64le-image = "musllinux_1_2"
113+
musllinux-s390x-image = "musllinux_1_2"
117114
musllinux-armv7l-image = "musllinux_1_2"
118115
musllinux-riscv64-image = "musllinux_1_2"
119116

@@ -140,7 +137,7 @@ inherit.config-settings = "append"
140137
# disable some tests
141138
# - BootstrapTest fails with custom OpenSSL and probably does not make much sense for this project
142139
# - ExportImport|RunCMake.install|RunCMake.file-GET_RUNTIME_DEPENDENCIES: c.f. https://discourse.cmake.org/t/cmake-test-suite-failing-on-alpine-linux/5064
143-
config-settings."cmake.define.RUN_CMAKE_TEST_EXCLUDE" = "BootstrapTest|ExportImport|RunCMake.install|RunCMake.RuntimePath|RunCMake.file-GET_RUNTIME_DEPENDENCIES"
140+
config-settings."cmake.define.RUN_CMAKE_TEST_EXCLUDE" = "BootstrapTest|CTestTestFdSetSize|ExportImport|RunCMake.install|RunCMake.RuntimePath|RunCMake.file-GET_RUNTIME_DEPENDENCIES"
144141

145142
[[tool.cibuildwheel.overrides]]
146143
select = ["*-musllinux_armv7l"]
@@ -158,7 +155,7 @@ inherit.config-settings = "append"
158155
config-settings."cmake.define.RUN_CMAKE_TEST" = "OFF"
159156

160157
[[tool.cibuildwheel.overrides]]
161-
select = ["*-musllinux_{s390x,riscv64}"]
158+
select = ["*-musllinux_{ppc64le,s390x,riscv64}"]
162159
build-frontend = "pip"
163160

164161

‎src/cmake/__init__.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
import os
44
import subprocess
55
import sys
6+
from importlib.metadata import distribution
67
from pathlib import Path
78

8-
if sys.version_info < (3, 8):
9-
from importlib_metadata import distribution
10-
else:
11-
from importlib.metadata import distribution
12-
139
from ._version import version as __version__
1410

1511
TYPE_CHECKING = False

‎tests/test_cmake.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33
import sys
44
import sysconfig
55
import textwrap
6+
from importlib.metadata import distribution
67

78
import pytest
89

9-
if sys.version_info < (3, 8):
10-
from importlib_metadata import distribution
11-
else:
12-
from importlib.metadata import distribution
13-
1410
import cmake
1511

1612
from . import push_argv

0 commit comments

Comments
 (0)