From 8eae3a9ee929ab18519037fd4a85e580d7c7a1ec Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 11 Jun 2024 10:52:07 -0700 Subject: python3-cryptography: upgrade 42.0.7 -> 42.0.8 * Refresh 0001-pyproject.toml-remove-benchmark-disable-option.patch * Also upgrade python3-cryptography-vectors 42.0.8 - 2024-06-04 * Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.2.2. https://cryptography.io/en/latest/changelog/#v42-0-8 https://github.com/pyca/cryptography/compare/42.0.7...42.0.8 (From OE-Core rev: 90c171a599b9800f2cfa5c8764f19358d7b4590c) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../python/python3-cryptography-vectors_42.0.7.bb | 31 ---------- .../python/python3-cryptography-vectors_42.0.8.bb | 31 ++++++++++ ...ject.toml-remove-benchmark-disable-option.patch | 4 +- .../python/python3-cryptography_42.0.7.bb | 67 ---------------------- .../python/python3-cryptography_42.0.8.bb | 67 ++++++++++++++++++++++ 5 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb create mode 100644 meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb delete mode 100644 meta/recipes-devtools/python/python3-cryptography_42.0.7.bb create mode 100644 meta/recipes-devtools/python/python3-cryptography_42.0.8.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb deleted file mode 100644 index 9a025a530c..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b" - -# NOTE: Make sure to keep this recipe at the same version as python3-cryptography -# Upgrade both recipes at the same time - -SRC_URI[sha256sum] = "8294c632dbe2cb14c7b7e24219560e674bc2224dfc4bed577ab077dbb82bfa3c" - -PYPI_PACKAGE = "cryptography_vectors" - -inherit pypi python_setuptools_build_meta - -DEPENDS += " \ - python3-cryptography \ -" - -do_install:append () { - # Remove the sha256 checksum lines for pycache files - sed ${D}${PYTHON_SITEPACKAGES_DIR}/cryptography_vectors-${PV}.dist-info/RECORD -e '/__pycache__/d' -i -} - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_REGEX = "" - -RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-cryptography." diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb new file mode 100644 index 0000000000..1256e75c47 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.8.bb @@ -0,0 +1,31 @@ +SUMMARY = "Test vectors for the cryptography package." +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ + file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ + file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b" + +# NOTE: Make sure to keep this recipe at the same version as python3-cryptography +# Upgrade both recipes at the same time + +SRC_URI[sha256sum] = "df5657367bc0a90c374309cb261009a2c53cae91a458781339a0f724f819a46a" + +PYPI_PACKAGE = "cryptography_vectors" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + python3-cryptography \ +" + +do_install:append () { + # Remove the sha256 checksum lines for pycache files + sed ${D}${PYTHON_SITEPACKAGES_DIR}/cryptography_vectors-${PV}.dist-info/RECORD -e '/__pycache__/d' -i +} + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "" + +RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-cryptography." diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index ec4bfcc98b..3eed171ffe 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch @@ -1,4 +1,4 @@ -From 18d78736f5c39784d5151b08fdfdd21c61225686 Mon Sep 17 00:00:00 2001 +From e4d7856fe842f3df7c614554d006d81253a5edf2 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Tue, 17 May 2022 17:22:48 +0800 Subject: [PATCH] pyproject.toml: remove --benchmark-disable option @@ -26,7 +26,7 @@ Signed-off-by: Tim Orling 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index 4f0fa36..0d54ea6 100644 +index d2e304f..10aabcf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ rust-version = ">=1.63.0" diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb deleted file mode 100644 index 5964400a04..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ - file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ - file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ - " -LDSHARED += "-pthread" - -SRC_URI[sha256sum] = "ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2" - -SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ - file://check-memfree.py \ - file://run-ptest \ - " - -require ${BPN}-crates.inc - -inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig - -DEPENDS += " \ - python3-cffi-native \ -" - -RDEPENDS:${PN} += " \ - python3-cffi \ -" - -RDEPENDS:${PN}:append:class-target = " \ - python3-numbers \ - python3-threading \ -" - -RDEPENDS:${PN}-ptest += " \ - python3-bcrypt \ - python3-cryptography-vectors (= ${PV}) \ - python3-hypothesis \ - python3-iso8601 \ - python3-mmap \ - python3-pretend \ - python3-psutil \ - python3-pytest \ - python3-unittest-automake-output \ - python3-pytest-subtests \ - python3-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - # remove test_x509.py as it needs benchmark and we don't - # want to introduce the benchmark dependency - rm -rf ${D}${PTEST_PATH}/tests/bench/test_x509.py - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ - cp -r ${S}/pyproject.toml ${D}${PTEST_PATH}/ -} - -FILES:${PN}-dbg += " \ - ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.8.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.8.bb new file mode 100644 index 0000000000..3f70f910d4 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography_42.0.8.bb @@ -0,0 +1,67 @@ +SUMMARY = "Provides cryptographic recipes and primitives to python developers" +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ + file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \ + file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b \ + " +LDSHARED += "-pthread" + +SRC_URI[sha256sum] = "8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2" + +SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ + file://check-memfree.py \ + file://run-ptest \ + " + +require ${BPN}-crates.inc + +inherit pypi python_setuptools3_rust cargo-update-recipe-crates pkgconfig + +DEPENDS += " \ + python3-cffi-native \ +" + +RDEPENDS:${PN} += " \ + python3-cffi \ +" + +RDEPENDS:${PN}:append:class-target = " \ + python3-numbers \ + python3-threading \ +" + +RDEPENDS:${PN}-ptest += " \ + python3-bcrypt \ + python3-cryptography-vectors (= ${PV}) \ + python3-hypothesis \ + python3-iso8601 \ + python3-mmap \ + python3-pretend \ + python3-psutil \ + python3-pytest \ + python3-unittest-automake-output \ + python3-pytest-subtests \ + python3-pytz \ +" + +inherit ptest + +do_install_ptest() { + install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + # remove test_x509.py as it needs benchmark and we don't + # want to introduce the benchmark dependency + rm -rf ${D}${PTEST_PATH}/tests/bench/test_x509.py + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ + cp -r ${S}/pyproject.toml ${D}${PTEST_PATH}/ +} + +FILES:${PN}-dbg += " \ + ${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/hazmat/bindings/.debug \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf