Skip to content

Commit ccc61da

Browse files
alexreaperhulkdependabot[bot]
authored
[backport] test and build on armv7l (#12420) (#12431)
* [backport] test and build on armv7l (#12420) * add explicit config to rtd (#12184) also update some versions we declare, why not * poetry 2.0 no longer has export, install it for certbot-josepy (#12241) * poetry 2.0 no longer has export, install it for certbot-josepy * Update .github/downstream.d/certbot-josepy.sh Co-authored-by: Alex Gaynor <[email protected]> --------- Co-authored-by: Alex Gaynor <[email protected]> * chore(deps): bump pyo3 from 0.23.3 to 0.23.4 (#12278) Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.23.3 to 0.23.4. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/v0.23.4/CHANGELOG.md) - [Commits](PyO3/pyo3@v0.23.3...v0.23.4) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * backport uv version bump --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Paul Kehrer <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent f299a48 commit ccc61da

9 files changed

+42
-24
lines changed

Diff for: ‎.github/downstream.d/certbot-josepy.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ case "${1}" in
66
cd josepy
77
git rev-parse HEAD
88
curl -sSL https://install.python-poetry.org | python3 -
9+
"${HOME}/.local/bin/poetry" self add poetry-plugin-export
910
"${HOME}/.local/bin/poetry" export -f constraints.txt --dev --without-hashes -o constraints.txt
1011
pip install -e . pytest -c constraints.txt
1112
;;

Diff for: ‎.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,10 @@ jobs:
171171
- {IMAGE: "centos-stream9", NOXSESSION: "tests", RUNNER: "ubuntu-latest"}
172172
- {IMAGE: "centos-stream9-fips", NOXSESSION: "tests", RUNNER: "ubuntu-latest", FIPS: true}
173173

174-
- {IMAGE: "ubuntu-rolling:aarch64", NOXSESSION: "tests", RUNNER: [self-hosted, Linux, ARM64]}
175-
- {IMAGE: "alpine:aarch64", NOXSESSION: "tests", RUNNER: [self-hosted, Linux, ARM64]}
174+
- {IMAGE: "ubuntu-rolling:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
175+
- {IMAGE: "alpine:aarch64", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
176+
177+
- {IMAGE: "ubuntu-rolling:armv7l", NOXSESSION: "tests", RUNNER: "ubuntu-24.04-arm"}
176178
timeout-minutes: 15
177179
env:
178180
RUSTUP_HOME: /root/.rustup

Diff for: ‎.github/workflows/wheel-builder.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,28 @@ jobs:
7474
- { NAME: "manylinux_2_34_x86_64", CONTAINER: "cryptography-manylinux_2_34:x86_64", RUNNER: "ubuntu-latest"}
7575
- { NAME: "musllinux_1_2_x86_64", CONTAINER: "cryptography-musllinux_1_2:x86_64", RUNNER: "ubuntu-latest"}
7676

77-
- { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: [self-hosted, Linux, ARM64] }
78-
- { NAME: "manylinux_2_28_aarch64", CONTAINER: "cryptography-manylinux_2_28:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
79-
- { NAME: "manylinux_2_34_aarch64", CONTAINER: "cryptography-manylinux_2_34:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
80-
- { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
77+
- { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: "ubuntu-24.04-arm" }
78+
- { NAME: "manylinux_2_28_aarch64", CONTAINER: "cryptography-manylinux_2_28:aarch64", RUNNER: "ubuntu-24.04-arm" }
79+
- { NAME: "manylinux_2_34_aarch64", CONTAINER: "cryptography-manylinux_2_34:aarch64", RUNNER: "ubuntu-24.04-arm" }
80+
- { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: "ubuntu-24.04-arm" }
81+
82+
- { NAME: "manylinux_2_31_armv7l", CONTAINER: "cryptography-manylinux_2_31:armv7l", RUNNER: "ubuntu-24.04-arm" }
8183
exclude:
8284
# There are no readily available musllinux PyPy distributions
8385
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
8486
MANYLINUX: { NAME: "musllinux_1_2_x86_64", CONTAINER: "cryptography-musllinux_1_2:x86_64", RUNNER: "ubuntu-latest"}
8587
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
86-
MANYLINUX: { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
88+
MANYLINUX: { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: "ubuntu-24.04-arm"}
8789

8890
# We also don't build pypy wheels for anything except the latest manylinux
8991
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
9092
MANYLINUX: { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest"}
9193
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
92-
MANYLINUX: { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: [self-hosted, Linux, ARM64]}
94+
MANYLINUX: { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: "ubuntu-24.04-arm" }
95+
96+
# No PyPy on armv7l either
97+
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
98+
MANYLINUX: { NAME: "manylinux_2_31_armv7l", CONTAINER: "cryptography-manylinux_2_31:armv7l", RUNNER: "ubuntu-24.04-arm" }
9399
name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
94100
steps:
95101
- name: Ridiculous-er workaround for static node20

Diff for: ‎.readthedocs.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ sphinx:
66
# The config file overrides the UI settings:
77
# https://github.com/pyca/cryptography/issues/5863#issuecomment-817828152
88
builder: dirhtml
9+
configuration: docs/conf.py
910

1011
formats:
1112
- pdf
1213

1314
build:
14-
os: "ubuntu-22.04"
15+
os: "ubuntu-24.04"
1516
tools:
16-
python: "3.11"
17-
rust: "1.70"
17+
python: "3.13"
18+
rust: "latest"
1819

1920
python:
2021
install:

Diff for: ‎CHANGELOG.rst

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
.. _v44-0-1:
5+
6+
44.0.1 - 2025-02-11
7+
~~~~~~~~~~~~~~~~~~~
8+
9+
* We now build ``armv7l`` ``manylinux`` wheels and publish them to PyPI.
10+
411
.. _v44-0-0:
512

613
44.0.0 - 2024-11-27
@@ -25,7 +32,7 @@ Changelog
2532
when using OpenSSL 3.2.0+.
2633
* Added support for the :class:`~cryptography.x509.Admissions` certificate extension.
2734
* Added basic support for PKCS7 decryption (including S/MIME 3.2) via
28-
:func:`~cryptography.hazmat.primitives.serialization.pkcs7.pkcs7_decrypt_der`,
35+
:func:`~cryptography.hazmat.primitives.serialization.pkcs7.pkcs7_decrypt_der`,
2936
:func:`~cryptography.hazmat.primitives.serialization.pkcs7.pkcs7_decrypt_pem`, and
3037
:func:`~cryptography.hazmat.primitives.serialization.pkcs7.pkcs7_decrypt_smime`.
3138

Diff for: ‎Cargo.lock

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rust-version = "1.65.0"
2020

2121
[workspace.dependencies]
2222
asn1 = { version = "0.20.0", default-features = false }
23-
pyo3 = { version = "0.23.2", features = ["abi3"] }
23+
pyo3 = { version = "0.23.4", features = ["abi3"] }
2424

2525
[profile.release]
2626
overflow-checks = true

Diff for: ‎ci-constraints-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ urllib3==2.0.7 ; python_full_version < '3.8'
292292
# via requests
293293
urllib3==2.2.3 ; python_full_version >= '3.8'
294294
# via requests
295-
uv==0.5.4 ; python_full_version >= '3.8'
295+
uv==0.5.29 ; python_full_version >= '3.8'
296296
# via nox
297297
virtualenv==20.26.6 ; python_full_version < '3.8'
298298
# via nox

Diff for: ‎docs/installation.rst

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ operating systems.
2222
* x86-64 macOS 13 Ventura and ARM64 macOS 14 Sonoma
2323
* x86-64 Ubuntu 20.04, 22.04, 24.04, rolling
2424
* ARM64 Ubuntu rolling
25+
* ARMv7l Ubuntu rolling
2526
* x86-64 Debian Bullseye (11.x), Bookworm (12.x), Trixie (13.x), and
2627
Sid (unstable)
2728
* x86-64 and ARM64 Alpine (latest)

0 commit comments

Comments
 (0)