diff options
author | Tim Orling <tim.orling@konsulko.com> | 2022-03-12 12:53:54 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-16 08:48:08 +0000 |
commit | c6f79207f8183eb3ec366dff39df070563e0e6e2 (patch) | |
tree | cadefa8e6e2de8e7d436e7a86958347dff842727 /meta/recipes-devtools/python/python3-cryptography | |
parent | 8af946e718317b1a47cf1a8a78938ba55f992cb8 (diff) | |
download | poky-c6f79207f8183eb3ec366dff39df070563e0e6e2.tar.gz |
python3-cryptography: move from meta-python
* inherit new setuptools_rust class (which inherits new pyo3 class, which
inherits cargo and python3-dir).
* RDEPENDS on python3-pytest-subtests for ptest
* Copy pyproject.toml for ptest as it defines the pytest.marker(s) needed
* Use 'cargo bitbake' to generate the crate:// SRC_URIs
- Needed some hacks to the Cargo.toml in src/rust/ to make this work (probably
only package.repository was strictly required):
[package]
description = "cryptography includes both high level recipes and low level interfaces to common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions."
homepage = "https://github.com/pyca/cryptography"
repository = "https://github.com/pyca/cryptography"
* Add patches to src/rust/Cargo.toml to fix cargo errors including pem version
* Add check-memfree.py to ptest to check for sufficient free memory
(From OE-Core rev: 27bd134c899d00d93806ecb0a62ec3f30b1e6ec6)
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')
4 files changed, 73 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch new file mode 100644 index 0000000000..d7ab757bb5 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From ec8d3f3c61280c8140b34ed1479baef5e706f064 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <tim.orling@konsulko.com> | ||
3 | Date: Fri, 14 Jan 2022 22:02:25 -0800 | ||
4 | Subject: [PATCH] Cargo.toml: specify pem version | ||
5 | |||
6 | pem = "1.0" is not resolving, specify the current | ||
7 | pem = { version: "1.0.2"} | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
12 | --- | ||
13 | src/rust/Cargo.toml | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml | ||
17 | index 617167d0..174eaa80 100644 | ||
18 | --- a/src/rust/Cargo.toml | ||
19 | +++ b/src/rust/Cargo.toml | ||
20 | @@ -9,7 +9,7 @@ publish = false | ||
21 | lazy_static = "1" | ||
22 | pyo3 = { version = "0.15.1" } | ||
23 | asn1 = { version = "0.8.7", default-features = false, features = ["derive"] } | ||
24 | -pem = "1.0" | ||
25 | +pem = { version = "1.0.2" } | ||
26 | chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] } | ||
27 | ouroboros = "0.13" | ||
28 | |||
29 | -- | ||
30 | 2.30.2 | ||
31 | |||
diff --git a/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch b/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch new file mode 100644 index 0000000000..366e3a4d39 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 4b73298b214a5b69ea6edf3c2e21dd82b2b29708 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <tim.orling@konsulko.com> | ||
3 | Date: Fri, 14 Jan 2022 22:34:59 -0800 | ||
4 | Subject: [PATCH 2/2] Cargo.toml: edition 2018 -> 2021 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
9 | --- | ||
10 | src/rust/Cargo.toml | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml | ||
14 | index 174eaa80..7ad053d9 100644 | ||
15 | --- a/src/rust/Cargo.toml | ||
16 | +++ b/src/rust/Cargo.toml | ||
17 | @@ -2,7 +2,7 @@ | ||
18 | name = "cryptography-rust" | ||
19 | version = "0.1.0" | ||
20 | authors = ["The cryptography developers <cryptography-dev@python.org>"] | ||
21 | -edition = "2018" | ||
22 | +edition = "2021" | ||
23 | publish = false | ||
24 | |||
25 | [dependencies] | ||
26 | -- | ||
27 | 2.30.2 | ||
28 | |||
diff --git a/meta/recipes-devtools/python/python3-cryptography/check-memfree.py b/meta/recipes-devtools/python/python3-cryptography/check-memfree.py new file mode 100755 index 0000000000..c111a9074c --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/check-memfree.py | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/usr/bin/env python3 | ||
2 | # https://stackoverflow.com/questions/22102999/get-total-physical-memory-in-python/28161352 | ||
3 | import sys | ||
4 | meminfo = dict((i.split()[0].rstrip(':'),int(i.split()[1])) for i in open('/proc/meminfo').readlines()) | ||
5 | mem_free = meminfo['MemTotal']/1024./1024. | ||
6 | if mem_free < 2.: | ||
7 | raise RuntimeError("Insufficient free memory({:.3f}): requires > 2 GB".format(mem_free)) | ||
8 | sys.exit(1) | ||
9 | else: | ||
10 | print("Free memory: {:.3f} GB".format(mem_free)) | ||
diff --git a/meta/recipes-devtools/python/python3-cryptography/run-ptest b/meta/recipes-devtools/python/python3-cryptography/run-ptest new file mode 100644 index 0000000000..1e97dda63e --- /dev/null +++ b/meta/recipes-devtools/python/python3-cryptography/run-ptest | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | if ./check-memfree.py; then | ||
3 | pytest -vvvv tests/ | ||
4 | fi | ||