mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
3ecfadb08a
Drop 0002-Cargo.toml-edition-2018-2021.patch
(issue fixed upstream)
License-Update: PSF licensed code removed as of
5e6476a4c6
(From OE-Core rev: 5c7ea0531bd099006c258b50c7b1747182123ae0)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001
|
|
From: Mingli Yu <mingli.yu@windriver.com>
|
|
Date: Tue, 17 May 2022 17:22:48 +0800
|
|
Subject: [PATCH] pyproject.toml: 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
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
|
|
---
|
|
pyproject.toml | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pyproject.toml b/pyproject.toml
|
|
index b2e511f..4a285af 100644
|
|
--- a/pyproject.toml
|
|
+++ b/pyproject.toml
|
|
@@ -85,7 +85,7 @@ line-length = 79
|
|
target-version = ["py37"]
|
|
|
|
[tool.pytest.ini_options]
|
|
-addopts = "-r s --capture=no --strict-markers --benchmark-disable"
|
|
+addopts = "-r s --capture=no --strict-markers"
|
|
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
|
|
+]
|