Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a9a4f5d

Browse filesBrowse files
alexalex
authored
Build cp39 wheels in addition to cp37 ones (#9998)
1 parent 2525eb0 commit a9a4f5d
Copy full SHA for a9a4f5d

File tree

5 files changed

+22
-5
lines changed
Filter options

5 files changed

+22
-5
lines changed

‎.github/workflows/wheel-builder.yml

Copy file name to clipboardExpand all lines: .github/workflows/wheel-builder.yml
+16-2Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
matrix:
5959
PYTHON:
6060
- { VERSION: "cp311-cp311", ABI_VERSION: 'cp37' }
61+
- { VERSION: "cp311-cp311", ABI_VERSION: 'cp39' }
6162
- { VERSION: "pp39-pypy39_pp73" }
6263
- { VERSION: "pp310-pypy310_pp73" }
6364
MANYLINUX:
@@ -154,7 +155,7 @@ jobs:
154155
- run: mv wheelhouse/cryptography*.whl cryptography-wheelhouse/
155156
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
156157
with:
157-
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.MANYLINUX.NAME }}-${{ matrix.PYTHON.VERSION }}"
158+
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.MANYLINUX.NAME }}-${{ matrix.PYTHON.VERSION }}-${{ matrix.PYTHON.ABI_VERSION }}"
158159
path: cryptography-wheelhouse/
159160

160161
macos:
@@ -176,6 +177,18 @@ jobs:
176177
# This will change in the future as we change the base Python we
177178
# build against
178179
_PYTHON_HOST_PLATFORM: 'macosx-10.9-universal2'
180+
- VERSION: '3.11'
181+
ABI_VERSION: 'cp39'
182+
# Despite the name, this is built for the macOS 11 SDK on arm64 and 10.9+ on intel
183+
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg'
184+
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.11/bin/python3'
185+
DEPLOYMENT_TARGET: '10.12'
186+
# This archflags is default, but let's be explicit
187+
ARCHFLAGS: '-arch x86_64 -arch arm64'
188+
# See https://github.com/pypa/cibuildwheel/blob/c8876b5c54a6c6b08de5d4b1586906b56203bd9e/cibuildwheel/macos.py#L257-L269
189+
# This will change in the future as we change the base Python we
190+
# build against
191+
_PYTHON_HOST_PLATFORM: 'macosx-10.9-universal2'
179192
- VERSION: '3.11'
180193
ABI_VERSION: 'cp37'
181194
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg'
@@ -281,6 +294,7 @@ jobs:
281294
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
282295
PYTHON:
283296
- {VERSION: "3.11", "ABI_VERSION": "cp37"}
297+
- {VERSION: "3.11", "ABI_VERSION": "cp39"}
284298
- {VERSION: "pypy-3.9"}
285299
- {VERSION: "pypy-3.10"}
286300
exclude:
@@ -348,5 +362,5 @@ jobs:
348362
- run: move wheelhouse\cryptography*.whl cryptography-wheelhouse\
349363
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
350364
with:
351-
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.WINDOWS.WINDOWS }}-${{ matrix.PYTHON.VERSION }}-${{ matrix.PYTHON.ABI_VERSION}}"
365+
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.WINDOWS.WINDOWS }}-${{ matrix.PYTHON.VERSION }}-${{ matrix.PYTHON.ABI_VERSION }}"
352366
path: cryptography-wheelhouse\

‎CHANGELOG.rst

Copy file name to clipboardExpand all lines: CHANGELOG.rst
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ Changelog
1717
* Parsing SSH certificates no longer permits malformed critical options with
1818
values, as documented in the 41.0.2 release notes.
1919
* Updated the minimum supported Rust version (MSRV) to 1.63.0, from 1.56.0.
20+
* We now publish both ``py37`` and ``py39`` ``abi3`` wheels. This should
21+
resolve some errors relating to initializing a module multiple times per
22+
process.
2023
* Support :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS` for
2124
X.509 certificate signing requests and certificate revocation lists with the
2225
keyword-only argument ``rsa_padding`` on the ``sign`` methods for

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pep8test = ["ruff", "mypy", "check-sdist", "click"]
8686
[[tool.setuptools-rust.ext-modules]]
8787
target = "cryptography.hazmat.bindings._rust"
8888
path = "src/rust/Cargo.toml"
89-
py-limited-api = true
89+
py-limited-api = "auto"
9090
rust-version = ">=1.63.0"
9191

9292

‎src/rust/Cargo.toml

Copy file name to clipboardExpand all lines: src/rust/Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ rust-version = "1.63.0"
1010
[dependencies]
1111
once_cell = "1"
1212
cfg-if = "1"
13-
pyo3 = { version = "0.20", features = ["abi3-py37"] }
13+
pyo3 = { version = "0.20", features = ["abi3"] }
1414
asn1 = { version = "0.15.5", default-features = false }
1515
cryptography-cffi = { path = "cryptography-cffi" }
1616
cryptography-x509 = { path = "cryptography-x509" }

‎src/rust/cryptography-cffi/Cargo.toml

Copy file name to clipboardExpand all lines: src/rust/cryptography-cffi/Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88
rust-version = "1.63.0"
99

1010
[dependencies]
11-
pyo3 = { version = "0.20", features = ["abi3-py37"] }
11+
pyo3 = { version = "0.20", features = ["abi3"] }
1212
openssl-sys = "0.9.97"
1313

1414
[build-dependencies]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.