summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-cryptography
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2024-02-01 20:59:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-15 09:18:09 +0000
commita332f47bdb307d5a9508bd46a652adc6001c6feb (patch)
tree9796f934acd6463a85f0d72dffd1c53b06bfc233 /meta/recipes-devtools/python/python3-cryptography
parent393da961be2c357a072fe5fa93ca2adf5a904c14 (diff)
downloadpoky-a332f47bdb307d5a9508bd46a652adc6001c6feb.tar.gz
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 <tim.orling@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-cryptography')
-rw-r--r--meta/recipes-devtools/python/python3-cryptography/0001-Fix-include-directory-when-cross-compiling-9129.patch52
-rw-r--r--meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch22
2 files changed, 10 insertions, 64 deletions
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 @@
1From 2f9cd402d3293f6efe0f3ac06f17c6c14edbed86 Mon Sep 17 00:00:00 2001
2From: James Hilliard <james.hilliard1@gmail.com>
3Date: Sun, 25 Jun 2023 17:39:19 -0600
4Subject: [PATCH] Fix include directory when cross compiling (#9129)
5
6Upstream-Status: Backport [https://github.com/pyca/cryptography/pull/9129]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 src/rust/cryptography-cffi/build.rs | 14 +++++++++++---
10 1 file changed, 11 insertions(+), 3 deletions(-)
11
12diff --git a/src/rust/cryptography-cffi/build.rs b/src/rust/cryptography-cffi/build.rs
13index 07590ad2e..384af1ddb 100644
14--- a/src/rust/cryptography-cffi/build.rs
15+++ b/src/rust/cryptography-cffi/build.rs
16@@ -47,9 +47,14 @@ fn main() {
17 )
18 .unwrap();
19 println!("cargo:rustc-cfg=python_implementation=\"{}\"", python_impl);
20- let python_include = run_python_script(
21+ let python_includes = run_python_script(
22 &python,
23- "import sysconfig; print(sysconfig.get_path('include'), end='')",
24+ "import os; \
25+ import setuptools.dist; \
26+ import setuptools.command.build_ext; \
27+ b = setuptools.command.build_ext.build_ext(setuptools.dist.Distribution()); \
28+ b.finalize_options(); \
29+ print(os.pathsep.join(b.include_dirs), end='')",
30 )
31 .unwrap();
32 let openssl_include =
33@@ -59,12 +64,15 @@ fn main() {
34 let mut build = cc::Build::new();
35 build
36 .file(openssl_c)
37- .include(python_include)
38 .include(openssl_include)
39 .flag_if_supported("-Wconversion")
40 .flag_if_supported("-Wno-error=sign-conversion")
41 .flag_if_supported("-Wno-unused-parameter");
42
43+ for python_include in env::split_paths(&python_includes) {
44+ build.include(python_include);
45+ }
46+
47 // Enable abi3 mode if we're not using PyPy.
48 if python_impl != "PyPy" {
49 // cp37 (Python 3.7 to help our grep when we some day drop 3.7 support)
50--
512.30.2
52
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]
19 19
20Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 20Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
21 21
22Refresh for 42.02
23Signed-off-by: Tim Orling <tim.orling@konsulko.com>
22--- 24---
23 pyproject.toml | 4 ++-- 25 pyproject.toml | 2 +-
24 1 file changed, 2 insertions(+), 2 deletions(-) 26 1 file changed, 1 insertion(+), 1 deletion(-)
25 27
26diff --git a/pyproject.toml b/pyproject.toml 28diff --git a/pyproject.toml b/pyproject.toml
27index b2e511f..4a285af 100644 29index c9a7979bd..dec4b7157 100644
28--- a/pyproject.toml 30--- a/pyproject.toml
29+++ b/pyproject.toml 31+++ b/pyproject.toml
30@@ -85,7 +85,7 @@ line-length = 79 32@@ -92,7 +92,7 @@ rust-version = ">=1.63.0"
31 target-version = ["py37"] 33
32 34
33 [tool.pytest.ini_options] 35 [tool.pytest.ini_options]
34-addopts = "-r s --capture=no --strict-markers --benchmark-disable" 36-addopts = "-r s --capture=no --strict-markers --benchmark-disable"
@@ -36,10 +38,6 @@ index b2e511f..4a285af 100644
36 console_output_style = "progress-even-when-capture-no" 38 console_output_style = "progress-even-when-capture-no"
37 markers = [ 39 markers = [
38 "skip_fips: this test is not executed in FIPS mode", 40 "skip_fips: this test is not executed in FIPS mode",
39@@ -151,4 +151,4 @@ git-only = [ 41--
40 "ci-constraints-requirements.txt", 422.34.1
41 ".gitattributes", 43
42 ".gitignore",
43-]
44\ No newline at end of file
45+]