Skip to content

Commit d839db4

Browse files
committed
Merge branch 'master' into v6.0.0
2 parents 2a67034 + c71960c commit d839db4

File tree

2 files changed

+9
-51
lines changed

2 files changed

+9
-51
lines changed

.github/workflows/wheels.yml

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ name: Wheel build
33
on:
44
release:
55
types: [created]
6-
schedule:
7-
# ┌───────────── minute (0 - 59)
8-
# │ ┌───────────── hour (0 - 23)
9-
# │ │ ┌───────────── day of the month (1 - 31)
10-
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
11-
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
12-
# │ │ │ │ │
13-
- cron: "42 3 * * 4"
146
push:
157
paths:
168
- .github/workflows/wheels.yml
@@ -35,42 +27,6 @@ on:
3527
permissions: {}
3628

3729
jobs:
38-
sdist:
39-
runs-on: ubuntu-24.04
40-
41-
permissions:
42-
contents: write
43-
44-
steps:
45-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
46-
47-
- name: Set up Python
48-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
49-
with:
50-
python-version: "3.x"
51-
52-
- name: Install lib dependencies
53-
run: sudo apt-get update -y -q && sudo apt-get install -y -q "libxml2=2.9.14*" "libxml2-dev=2.9.14*" libxslt1.1 libxslt1-dev
54-
55-
- name: Install Python dependencies
56-
run: python -m pip install -U pip setuptools && python -m pip install -U docutils pygments sphinx sphinx-rtd-theme -r requirements.txt
57-
58-
- name: Build docs and sdist
59-
run: make html sdist
60-
env: { STATIC_DEPS: false; CFLAGS="-Og" } # it's run-once, so build more quickly
61-
62-
- name: Upload sdist
63-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
64-
with:
65-
name: sdist
66-
path: dist/*.tar.gz
67-
68-
- name: Upload website
69-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
70-
with:
71-
name: website
72-
path: doc/html
73-
7430
generate-wheels-matrix:
7531
# Create a matrix of all architectures & versions to build.
7632
# This enables the next step to run cibuildwheel in parallel.
@@ -92,11 +48,7 @@ jobs:
9248
| jq -nRc '{"only": inputs, "os": "ubuntu-22.04"}' \
9349
| sed -e '/aarch64/s|ubuntu-22.04|ubuntu-22.04-arm|' \
9450
&& cibuildwheel --print-build-identifiers --platform macos \
95-
| jq -nRc '{"only": inputs, "os": "macos-latest"}' \
96-
&& cibuildwheel --print-build-identifiers --platform windows \
97-
| jq -nRc '{"only": inputs, "os": "windows-2022"}' \
98-
&& cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
99-
| jq -nRc '{"only": inputs, "os": "windows-11-arm"}'
51+
| jq -nRc '{"only": inputs, "os": "macos-latest"}'
10052
} | jq -sc
10153
)
10254
echo "include=$MATRIX"
@@ -175,7 +127,7 @@ jobs:
175127

176128
upload_release_assets:
177129
name: Upload Release Assets
178-
needs: [ sdist, build_wheels ]
130+
needs: [ build_wheels ]
179131
runs-on: ubuntu-latest
180132

181133
permissions:

pyproject.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ skip = [
1414
"cp37-*",
1515
"pp37-*",
1616
"pp38-*",
17+
"cp38-*",
18+
"cp39-*",
19+
"cp310-*",
20+
"cp311-*",
21+
"pp39-*",
22+
"pp310-*",
1723
"pp*-manylinux_i686",
1824
"*-musllinux_i686",
1925
# Py3.8 wheel for macos is not universal: https://bugs.launchpad.net/lxml/+bug/2055404
@@ -36,7 +42,7 @@ skip = [
3642

3743
[tool.cibuildwheel.linux]
3844
#archs = ["x86_64", "aarch64", "i686", "ppc64le", "s390x", "armv7l"]
39-
archs = ["x86_64", "aarch64", "i686", "armv7l"]
45+
archs = ["x86_64", "aarch64"]
4046
repair-wheel-command = "auditwheel repair --strip -w {dest_dir} {wheel}"
4147

4248
[tool.cibuildwheel.linux.environment]

0 commit comments

Comments
 (0)