From a332f47bdb307d5a9508bd46a652adc6001c6feb Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Thu, 1 Feb 2024 20:59:34 -0800 Subject: python3-cryptography: upgrade 41.0.7 to 42.0.2 * Also upgrade python3-cryptography-vectors * Drop patch for 9129, fixed upstream * Refresh pyproject.toml --benchmark-disable patch * Refresh -crates.inc Changes: https://cryptography.io/en/latest/changelog/#v42-0-2 https://cryptography.io/en/latest/changelog/#v42-0-1 https://cryptography.io/en/latest/changelog/#v42-0-0 https://github.com/pyca/cryptography/compare/41.0.7...42.0.2 RP: Add new REPENDS on python3-mmap for ptest RP: Increase memory in ptest image to avoid test failures (From OE-Core rev: 45ee8ae2f6173a11e6d004c8eeba138073b84d18) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- ...clude-directory-when-cross-compiling-9129.patch | 52 ---------------------- ...ject.toml-remove-benchmark-disable-option.patch | 22 +++++---- 2 files changed, 10 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch (limited to 'meta/recipes-devtools/python/python3-cryptography') diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch deleted file mode 100644 index d720359ded..0000000000 --- a/meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2f9cd402d3293f6efe0f3ac06f17c6c14edbed86 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Sun, 25 Jun 2023 17:39:19 -0600 -Subject: [PATCH] Fix include directory when cross compiling (#9129) - -Upstream-Status: Backport [https://github.com/pyca/cryptography/pull/9129] -Signed-off-by: Alexander Kanavin ---- - src/rust/cryptography-cffi/build.rs | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs -index 07590ad2e..384af1ddb 100644 ---- a/src/rust/cryptography-cffi/build.rs -+++ b/src/rust/cryptography-cffi/build.rs -@@ -47,9 +47,14 @@ fn main() { - ) - .unwrap(); - println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl); -- let python_include = run_python_script( -+ let python_includes = run_python_script( - &python, -- "import sysconfig; print(sysconfig.get_path('include'), end='')", -+ "import os; \ -+ import setuptools.dist; \ -+ import setuptools.command.build_ext; \ -+ b = setuptools.command.build_ext.build_ext(setuptools.dist.Distribution()); \ -+ b.finalize_options(); \ -+ print(os.pathsep.join(b.include_dirs), end='')", - ) - .unwrap(); - let openssl_include = -@@ -59,12 +64,15 @@ fn main() { - let mut build = cc::Build::new(); - build - .file(openssl_c) -- .include(python_include) - .include(openssl_include) - .flag_if_supported("-Wconversion") - .flag_if_supported("-Wno-error=sign-conversion") - .flag_if_supported("-Wno-unused-parameter"); - -+ for python_include in env::split_paths(&python_includes) { -+ build.include(python_include); -+ } -+ - // Enable abi3 mode if we're not using PyPy. - if python_impl != "PyPy" { - // cp37 (Python 3.7 to help our grep when we some day drop 3.7 support) --- -2.30.2 - 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 69cf451d57..f9c8d1393d 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 @@ -19,16 +19,18 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Mingli Yu +Refresh for 42.02 +Signed-off-by: Tim Orling --- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index b2e511f..4a285af 100644 +index c9a7979bd..dec4b7157 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -85,7 +85,7 @@ line-length = 79 - target-version = ["py37"] +@@ -92,7 +92,7 @@ rust-version = ">=1.63.0" + [tool.pytest.ini_options] -addopts = "-r s --capture=no --strict-markers --benchmark-disable" @@ -36,10 +38,6 @@ index b2e511f..4a285af 100644 console_output_style = "progress-even-when-capture-no" markers = [ "skip_fips: this test is not executed in FIPS mode", -@@ -151,4 +151,4 @@ git-only = [ - "ci-constraints-requirements.txt", - ".gitattributes", - ".gitignore", --] -\ No newline at end of file -+] +-- +2.34.1 + -- cgit v1.2.3-54-g00ecf