| Andrew Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame] | 1 | From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Tue, 17 May 2022 17:22:48 +0800 |
| 4 | Subject: [PATCH] pyproject.toml: remove --benchmark-disable option |
| 5 | |
| 6 | The new version introduced below change, so remove the option |
| 7 | to avoid python3-pytest-benchmark rdepends to fix the gap. |
| 8 | 496703c8 Refs #7079 -- added basic scaffholding for benchmarks (#7087) |
| 9 | |
| 10 | Fixes: |
| 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 | |
| 18 | Upstream-Status: Inappropriate [OE specific] |
| 19 | |
| 20 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| Andrew Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame] | 21 | |
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 22 | Refresh for 42.02 |
| 23 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 24 | --- |
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 25 | pyproject.toml | 2 +- |
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 27 | |
| 28 | diff --git a/pyproject.toml b/pyproject.toml |
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 29 | index c9a7979bd..dec4b7157 100644 |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 30 | --- a/pyproject.toml |
| 31 | +++ b/pyproject.toml |
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 32 | @@ -92,7 +92,7 @@ rust-version = ">=1.63.0" |
| 33 | |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 34 | |
| 35 | [tool.pytest.ini_options] |
| 36 | -addopts = "-r s --capture=no --strict-markers --benchmark-disable" |
| 37 | +addopts = "-r s --capture=no --strict-markers" |
| Andrew Geissler | 8f84068 | 2023-07-21 09:09:43 -0500 | [diff] [blame] | 38 | console_output_style = "progress-even-when-capture-no" |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame] | 39 | markers = [ |
| 40 | "skip_fips: this test is not executed in FIPS mode", |
| Patrick Williams | 73bd93f | 2024-02-20 08:07:48 -0600 | [diff] [blame] | 41 | -- |
| 42 | 2.34.1 |
| 43 | |