summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2022-05-17 18:22:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-20 22:52:22 +0100
commit5553ef8096a2ba48272df58845a8f9e23f8f5297 (patch)
treec41dc3248f866751bd3d06badfdb7664c35e7bc0
parent812ebb02279fcdfb0be189030651b8c104d438ab (diff)
downloadpoky-5553ef8096a2ba48272df58845a8f9e23f8f5297.tar.gz
python3-cryptography: remove --benchmark-disable option
The new version introduced below change, so remove the option to avoid python3-pytest-benchmark rdepends to fix the gap. 496703c8 Refs #7079 -- added basic scaffholding for benchmarks (#7087) Fixes: # ./run-ptest Free memory: 31.283 GB ERROR: usage: pytest [options] [file_or_dir] [file_or_dir] [...] pytest: error: unrecognized arguments: --benchmark-disable inifile: /usr/lib/python3-cryptography/ptest/pyproject.toml rootdir: /usr/lib/python3-cryptography/ptest (From OE-Core rev: 7fdfa8504dcc9c15e957256c97b43eec5291216c) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch40
-rw-r--r--meta/recipes-devtools/python/python3-cryptography_37.0.1.bb1
2 files changed, 41 insertions, 0 deletions
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
new file mode 100644
index 0000000000..481f595246
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch
@@ -0,0 +1,40 @@
1From ce972ea92d724f232323a9a6265a8b44d913d4d8 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 17 May 2022 17:22:48 +0800
4Subject: [PATCH] pyproject.toml: remove --benchmark-disable option
5
6The new version introduced below change, so remove the option
7to avoid python3-pytest-benchmark rdepends to fix the gap.
8496703c8 Refs #7079 -- added basic scaffholding for benchmarks (#7087)
9
10Fixes:
11 # ./run-ptest
12 Free memory: 31.283 GB
13 ERROR: usage: pytest [options] [file_or_dir] [file_or_dir] [...]
14 pytest: error: unrecognized arguments: --benchmark-disable
15 inifile: /usr/lib/python3-cryptography/ptest/pyproject.toml
16 rootdir: /usr/lib/python3-cryptography/ptest
17
18Upstream-Status: Inappropriate [OE specific]
19
20Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
21---
22 pyproject.toml | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/pyproject.toml b/pyproject.toml
26index 4d58129..b011fca 100644
27--- a/pyproject.toml
28+++ b/pyproject.toml
29@@ -15,7 +15,7 @@ line-length = 79
30 target-version = ["py36"]
31
32 [tool.pytest.ini_options]
33-addopts = "-r s --capture=no --strict-markers --benchmark-disable"
34+addopts = "-r s --capture=no --strict-markers"
35 markers = [
36 "skip_fips: this test is not executed in FIPS mode",
37 "supported: parametrized test requiring only_if and skip_message",
38--
392.25.1
40
diff --git a/meta/recipes-devtools/python/python3-cryptography_37.0.1.bb b/meta/recipes-devtools/python/python3-cryptography_37.0.1.bb
index 1271954a08..191ea29b9c 100644
--- a/meta/recipes-devtools/python/python3-cryptography_37.0.1.bb
+++ b/meta/recipes-devtools/python/python3-cryptography_37.0.1.bb
@@ -15,6 +15,7 @@ SRC_URI += "file://run-ptest \
15 file://check-memfree.py \ 15 file://check-memfree.py \
16 file://0001-Cargo.toml-specify-pem-version.patch \ 16 file://0001-Cargo.toml-specify-pem-version.patch \
17 file://0002-Cargo.toml-edition-2018-2021.patch \ 17 file://0002-Cargo.toml-edition-2018-2021.patch \
18 file://0001-pyproject.toml-remove-benchmark-disable-option.patch \
18 crate://crates.io/Inflector/0.11.4 \ 19 crate://crates.io/Inflector/0.11.4 \
19 crate://crates.io/aliasable/0.1.3 \ 20 crate://crates.io/aliasable/0.1.3 \
20 crate://crates.io/asn1/0.8.7 \ 21 crate://crates.io/asn1/0.8.7 \