diff --git a/.riot/requirements/10fafcd.txt b/.riot/requirements/10fafcd.txt new file mode 100644 index 00000000000..31c67a71baa --- /dev/null +++ b/.riot/requirements/10fafcd.txt @@ -0,0 +1,38 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/10fafcd.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +importlib-metadata==8.7.0 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pygments==2.19.2 +pytest==8.4.1 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 +zipp==3.23.0 diff --git a/.riot/requirements/12cf79a.txt b/.riot/requirements/12cf79a.txt new file mode 100644 index 00000000000..7480eac2609 --- /dev/null +++ b/.riot/requirements/12cf79a.txt @@ -0,0 +1,39 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/12cf79a.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +importlib-metadata==8.7.0 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +py==1.11.0 +pytest==6.2.5 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.5.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +toml==0.10.2 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 +zipp==3.23.0 diff --git a/.riot/requirements/12d9f7a.txt b/.riot/requirements/12d9f7a.txt new file mode 100644 index 00000000000..db05e0a4382 --- /dev/null +++ b/.riot/requirements/12d9f7a.txt @@ -0,0 +1,33 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/12d9f7a.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pytest==7.4.4 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/.riot/requirements/157020e.txt b/.riot/requirements/157020e.txt new file mode 100644 index 00000000000..8f3cd39dd9b --- /dev/null +++ b/.riot/requirements/157020e.txt @@ -0,0 +1,37 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/157020e.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +importlib-metadata==8.7.0 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pytest==7.4.4 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 +zipp==3.23.0 diff --git a/.riot/requirements/180a759.txt b/.riot/requirements/180a759.txt new file mode 100644 index 00000000000..a3bc9257d59 --- /dev/null +++ b/.riot/requirements/180a759.txt @@ -0,0 +1,37 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/180a759.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +py==1.11.0 +pytest==6.2.5 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.5.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +toml==0.10.2 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/.riot/requirements/19de119.txt b/.riot/requirements/19de119.txt new file mode 100644 index 00000000000..6e21bea7a03 --- /dev/null +++ b/.riot/requirements/19de119.txt @@ -0,0 +1,36 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/19de119.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pygments==2.19.2 +pytest==8.4.1 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/.riot/requirements/3895842.txt b/.riot/requirements/3895842.txt new file mode 100644 index 00000000000..014828907e2 --- /dev/null +++ b/.riot/requirements/3895842.txt @@ -0,0 +1,34 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/3895842.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pygments==2.19.2 +pytest==8.4.1 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/.riot/requirements/5d311fc.txt b/.riot/requirements/5d311fc.txt new file mode 100644 index 00000000000..8160c68d344 --- /dev/null +++ b/.riot/requirements/5d311fc.txt @@ -0,0 +1,35 @@ +# +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/5d311fc.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +exceptiongroup==1.3.0 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +pytest==7.4.4 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.8.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +tomli==2.2.1 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/.riot/requirements/db4e80f.txt b/.riot/requirements/db4e80f.txt new file mode 100644 index 00000000000..89a46a337c3 --- /dev/null +++ b/.riot/requirements/db4e80f.txt @@ -0,0 +1,35 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --allow-unsafe --no-annotate .riot/requirements/db4e80f.in +# +anyio==4.9.0 +attrs==25.3.0 +certifi==2025.7.14 +charset-normalizer==3.4.2 +coverage[toml]==7.9.2 +execnet==2.1.1 +h11==0.16.0 +httpcore==1.0.9 +httpx==0.28.1 +hypothesis==6.135.32 +idna==3.10 +iniconfig==2.1.0 +mock==5.2.0 +msgpack==1.1.1 +opentracing==2.4.0 +packaging==25.0 +pluggy==1.6.0 +py==1.11.0 +pytest==6.2.5 +pytest-cov==6.2.1 +pytest-mock==3.14.1 +pytest-randomly==3.16.0 +pytest-xdist==3.5.0 +requests==2.32.4 +sniffio==1.3.1 +sortedcontainers==2.4.0 +toml==0.10.2 +typing-extensions==4.14.1 +urllib3==2.5.0 diff --git a/hatch.toml b/hatch.toml index ea1f6130614..4343a9ca5bb 100644 --- a/hatch.toml +++ b/hatch.toml @@ -224,32 +224,6 @@ test = [ [[envs.multiple_os_tests.matrix]] python = ["3.13", "3.12", "3.10", "3.8"] -[envs.pytest_plugin_v2] -template = "pytest_plugin_v2" -dependencies = [ - "httpx", - "msgpack", - "requests", - "hypothesis", - "pytest{matrix:pytest}", - "pytest-cov", - "pytest-mock" -] - -[envs.pytest_plugin_v2.env-vars] -DD_AGENT_PORT = "9126" - -[envs.pytest_plugin_v2.scripts] -test = [ - "pip freeze", - "echo $PYTEST_ADDOPTS", - "pytest -c /dev/null --no-ddtrace --no-cov tests/contrib/pytest {args:}", -] - -[[envs.pytest_plugin_v2.matrix]] -python = ["3.9", "3.10", "3.12"] -pytest = ["~=6.0", "~=7.0", "~=8.0"] - [envs.snapshot_viewer] dev-mode = false detached = true diff --git a/lib-injection/sources/requirements.csv b/lib-injection/sources/requirements.csv index 001972e32ef..9545225b600 100644 --- a/lib-injection/sources/requirements.csv +++ b/lib-injection/sources/requirements.csv @@ -12,4 +12,5 @@ typing_extensions,, xmltodict,>=0.12, wrapt,>=1, opentracing,>=2.0.0, +opentelemetry-exporter-otlp,>=1.0.0, tiktoken,, diff --git a/riotfile.py b/riotfile.py index c3f3c66dce2..b13e4fe7db8 100644 --- a/riotfile.py +++ b/riotfile.py @@ -1789,6 +1789,37 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT "httpx": latest, }, ), + Venv( + name="pytest_plugin_v2", + command="pytest -c /dev/null --no-ddtrace --no-cov tests/contrib/pytest {cmdargs}", + pys=["3.9", "3.10", "3.12"], + pkgs={ + "httpx": latest, + "msgpack": latest, + "requests": latest, + "hypothesis": latest, + }, + env={ + "DD_AGENT_PORT": "9126", + }, + venvs=[ + Venv( + pkgs={ + "pytest": "~=6.0", + }, + ), + Venv( + pkgs={ + "pytest": "~=7.0", + }, + ), + Venv( + pkgs={ + "pytest": "~=8.0", + }, + ), + ], + ), ], ), Venv( diff --git a/tests/ci_visibility/suitespec.yml b/tests/ci_visibility/suitespec.yml index 8945979a99a..f759978212d 100644 --- a/tests/ci_visibility/suitespec.yml +++ b/tests/ci_visibility/suitespec.yml @@ -83,7 +83,7 @@ suites: - tests/contrib/pytest_bdd/* - tests/snapshots/tests.contrib.pytest.* pattern: pytest_plugin_v2 - runner: hatch + runner: riot snapshot: true selenium: parallelism: 2