Skip to content

Fix duplicate benchmark option registration when pytest-benchmark is installed #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 28, 2025
Merged

Fix duplicate benchmark option registration when pytest-benchmark is installed #684

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce47473
cond addopts
KRRT7 Aug 24, 2025
ca3c5a8
Merge branch 'main' into pytest-benchmark-err-fix
KRRT7 Aug 24, 2025
ba2289f
Merge branch 'main' into pytest-benchmark-err-fix
KRRT7 Sep 22, 2025
27df760
Merge branch 'main' into pytest-benchmark-err-fix
KRRT7 Oct 22, 2025
d2ece1e
Merge branch 'main' into pytest-benchmark-err-fix
KRRT7 Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions codeflash-benchmark/codeflash_benchmark/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ def pytest_addoption(parser: pytest.Parser) -> None:
parser.addoption(
"--codeflash-trace", action="store_true", default=False, help="Enable CodeFlash tracing for benchmarks"
)
# These options are ignored when --codeflash-trace is used
for option, action, default, help_text in benchmark_options:
help_suffix = " (ignored when --codeflash-trace is used)"
parser.addoption(option, action=action, default=default, help=help_text + help_suffix)
# Only add benchmark options if pytest-benchmark is not installed for backward compatibility with existing pytest-benchmark setup
if not PYTEST_BENCHMARK_INSTALLED:
for option, action, default, help_text in benchmark_options:
help_suffix = " (ignored when --codeflash-trace is used)"
parser.addoption(option, action=action, default=default, help=help_text + help_suffix)


@pytest.fixture
Expand Down
Loading