diff --git a/mingw-w64-python-cryptography/001-disable-abi3.patch b/mingw-w64-python-cryptography/001-disable-abi3.patch index b08a95bc1a..641396ac27 100644 --- a/mingw-w64-python-cryptography/001-disable-abi3.patch +++ b/mingw-w64-python-cryptography/001-disable-abi3.patch @@ -1,15 +1,22 @@ ---- a/setup.py -+++ b/setup.py -@@ -48,12 +48,6 @@ - "cryptography.hazmat.bindings._rust", - "src/rust/Cargo.toml", - py_limited_api=True, -- # Enable abi3 mode if we're not using PyPy. -- features=( -- [] -- if platform.python_implementation() == "PyPy" -- else ["pyo3/abi3-py36"] -- ), - rust_version=">=1.48.0", - ) - ], +--- a/src/rust/Cargo.toml ++++ b/src/rust/Cargo.toml +@@ -9,7 +9,7 @@ + + [dependencies] + once_cell = "1" +-pyo3 = { version = "0.18", features = ["abi3-py37"] } ++pyo3 = { version = "0.18" } + asn1 = { version = "0.15.2", default-features = false } + cryptography-cffi = { path = "cryptography-cffi" } + cryptography-x509 = { path = "cryptography-x509" } +--- a/src/rust/cryptography-cffi/Cargo.toml ++++ b/src/rust/cryptography-cffi/Cargo.toml +@@ -8,7 +8,7 @@ + rust-version = "1.56.0" + + [dependencies] +-pyo3 = { version = "0.18", features = ["abi3-py37"] } ++pyo3 = { version = "0.18" } + openssl-sys = "0.9.88" + + [build-dependencies] diff --git a/mingw-w64-python-cryptography/PKGBUILD b/mingw-w64-python-cryptography/PKGBUILD index e764171268..b9f29cb7f6 100644 --- a/mingw-w64-python-cryptography/PKGBUILD +++ b/mingw-w64-python-cryptography/PKGBUILD @@ -8,11 +8,11 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}3") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}3") -pkgver=40.0.2 +pkgver=41.0.1 pkgrel=1 pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers (mingw-w64)" url='https://github.com/pyca/cryptography' -license=('Apache') +license=('spdx:Apache-2.0') arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') depends=("${MINGW_PACKAGE_PREFIX}-python" @@ -33,17 +33,19 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner" "${MINGW_PACKAGE_PREFIX}-python-pytz") source=(https://pypi.io/packages/source/c/cryptography/${_realname}-${pkgver}.tar.gz 001-disable-abi3.patch) -sha256sums=('c33c0d32b8594fa647d2e01dbccc303478e16fdd7cf98652d5b3ed11aa5e5c99' - 'def2fee53afa97930c98cf1047f496a926bcf538f20972b14fc36facecd4372b') +sha256sums=('d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006' + '536b9fa277c612d580ea609190e5ae6688c4e29345e0c3d3c03486997972efb5') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -Np1 -i "${srcdir}"/001-disable-abi3.patch + + rm -rf "${srcdir}/python-build-${MSYSTEM}" | true + cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/python-build-${MSYSTEM}" } build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/python-build-${MSYSTEM}" ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } @@ -51,11 +53,11 @@ build() { check() { cd "${srcdir}/${_realname}-${pkgver}" - # ${MINGW_PREFIX}/bin/python setup.py pytest + # ${MINGW_PREFIX}/bin/python -m pytest } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/python-build-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \