Skip to content

test: declare ops-scenario and ops-tracing test dependencies #2891

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

Open
tonyandrewmeyer wants to merge 4 commits into
base: main
Choose a base branch
from
Open

test: declare ops-scenario and ops-tracing test dependencies #2891

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50eb129
test: declare ops-scenario and ops-tracing test dependencies
tonyandrewmeyer Nov 11, 2026
b0ed0e8
Merge branch 'main' into subproject-test-deps
tonyandrewmeyer Nov 12, 2026
3f9e67f
test: address review feedback on subproject test dependencies
tonyandrewmeyer Nov 12, 2026
c8b0890
test: add a tox environment for testing/tests
tonyandrewmeyer Nov 13, 2026
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
6 changes: 6 additions & 0 deletions testing/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,11 @@ classifiers = [
"Homepage" = "https://github.com/canonical/operator"
"Bug Tracker" = "https://github.com/canonical/operator/issues"

[dependency-groups]
unit = [
"ops-tracing",
"pytest~=9.0",
]

[tool.hatch.build.targets.wheel]
packages = ["src/scenario"] # Hatch looks for 'ops_scenario' by default.
3 changes: 3 additions & 0 deletions testing/tests/benchmark/test_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import ops
from ops import testing

# The 'benchmark' fixture comes from the pytest-benchmark plugin.
pytest.importorskip('pytest_benchmark')
Comment thread
tonyandrewmeyer marked this conversation as resolved.
Resolved


@pytest.fixture
def benchmark_charm():
Expand Down
3 changes: 3 additions & 0 deletions testing/tests/test_e2e/test_trace_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@

from __future__ import annotations

import pytest
from scenario import Context, State

import ops

pytest.importorskip('ops_tracing')

META = {
'name': 'traced_charm',
'requires': {'charm-tracing': {'interface': 'tracing', 'limit': 1}},
Expand Down
2 changes: 1 addition & 1 deletion tracing/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ lint = [
"pyright~=1.1",
]
unit = [
"ops[testing]",
"ops-scenario",
"pytest~=9.0",
]

Expand Down
18 changes: 15 additions & 3 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading