From 28bbd8f4edf6c33a7a596fca703cf873e06e5f02 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 5 May 2026 15:41:44 +0200 Subject: [PATCH 1/6] opentelemetry-test-utils: move requirements environment markers to a constraint file For some reason dependabot fails parsing them. --- .../test-requirements-constraints.txt | 5 +++++ tests/opentelemetry-test-utils/test-requirements.txt | 7 +++---- tox.ini | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 tests/opentelemetry-test-utils/test-requirements-constraints.txt diff --git a/tests/opentelemetry-test-utils/test-requirements-constraints.txt b/tests/opentelemetry-test-utils/test-requirements-constraints.txt new file mode 100644 index 0000000000..35f7e87124 --- /dev/null +++ b/tests/opentelemetry-test-utils/test-requirements-constraints.txt @@ -0,0 +1,5 @@ +# these are required for weaver integration tests, we're running that only on linux / CPython +# because of lack of support for gRPC on Windows in some cases. +opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt index 6b4dbcec04..b3fae13bfc 100644 --- a/tests/opentelemetry-test-utils/test-requirements.txt +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -15,7 +15,6 @@ zipp==3.19.2 -e tests/opentelemetry-test-utils # these are required for weaver integration tests, we're running that only on linux / CPython # because of lack of support for gRPC on Windows in some cases. -# note: tox does not support PEP 508 markers on `-e` editable installs, so these are installed non-editable -./opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -./exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -./exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +-e opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +-e exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +-e exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' diff --git a/tox.ini b/tox.ini index d1c5aff8c9..8d07741c9a 100644 --- a/tox.ini +++ b/tox.ini @@ -122,7 +122,7 @@ deps = semantic-conventions: -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt - test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt + test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt opentelemetry-proto-gen-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt From 4051a5a8a0eca9ca4ebeb55bd1e18730166ba0fa Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 5 May 2026 15:57:31 +0200 Subject: [PATCH 2/6] Second try --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8d07741c9a..4fcbebba93 100644 --- a/tox.ini +++ b/tox.ini @@ -122,7 +122,8 @@ deps = semantic-conventions: -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt - test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt + test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt + test-utils: -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt opentelemetry-proto-gen-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt From ccc8ad764251a15b47d6486c3cf9b99d50b7c08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C3=ADdio=20Neto?= <9735060+emdneto@users.noreply.github.com> Date: Tue, 5 May 2026 11:45:16 -0300 Subject: [PATCH 3/6] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com> --- .../test-requirements-constraints.txt | 4 ++-- tests/opentelemetry-test-utils/test-requirements.txt | 6 +++--- tox.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/opentelemetry-test-utils/test-requirements-constraints.txt b/tests/opentelemetry-test-utils/test-requirements-constraints.txt index 35f7e87124..53e085ae7a 100644 --- a/tests/opentelemetry-test-utils/test-requirements-constraints.txt +++ b/tests/opentelemetry-test-utils/test-requirements-constraints.txt @@ -1,5 +1,5 @@ # these are required for weaver integration tests, we're running that only on linux / CPython # because of lack of support for gRPC on Windows in some cases. opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt index b3fae13bfc..246399549e 100644 --- a/tests/opentelemetry-test-utils/test-requirements.txt +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -15,6 +15,6 @@ zipp==3.19.2 -e tests/opentelemetry-test-utils # these are required for weaver integration tests, we're running that only on linux / CPython # because of lack of support for gRPC on Windows in some cases. --e opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' --e exporter/opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' --e exporter/opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' +-e opentelemetry-proto +-e exporter/opentelemetry-exporter-otlp-proto-common +-e exporter/opentelemetry-exporter-otlp-proto-grpc diff --git a/tox.ini b/tox.ini index 4fcbebba93..ae3bc0cbf5 100644 --- a/tox.ini +++ b/tox.ini @@ -122,8 +122,8 @@ deps = semantic-conventions: -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt - test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt test-utils: -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt +test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt opentelemetry-proto-gen-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt From 1ee8b0cffcb044500eb9eb7d8f9cf46adf79f353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C3=ADdio=20Neto?= <9735060+emdneto@users.noreply.github.com> Date: Tue, 5 May 2026 11:48:11 -0300 Subject: [PATCH 4/6] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ae3bc0cbf5..fe7c30ed0a 100644 --- a/tox.ini +++ b/tox.ini @@ -123,7 +123,7 @@ deps = semantic-conventions: -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt test-utils: -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt -test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt + test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt opentelemetry-proto-gen-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt From 452af7c21e3b55cd6fd1d3588435c58fc202893c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Em=C3=ADdio=20Neto?= <9735060+emdneto@users.noreply.github.com> Date: Thu, 7 May 2026 23:09:18 -0300 Subject: [PATCH 5/6] Update dependency paths in test-requirements.txt Change paths for dependencies in test-requirements.txt --- tests/opentelemetry-test-utils/test-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt index 246399549e..9a3888183c 100644 --- a/tests/opentelemetry-test-utils/test-requirements.txt +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -15,6 +15,6 @@ zipp==3.19.2 -e tests/opentelemetry-test-utils # these are required for weaver integration tests, we're running that only on linux / CPython # because of lack of support for gRPC on Windows in some cases. --e opentelemetry-proto --e exporter/opentelemetry-exporter-otlp-proto-common --e exporter/opentelemetry-exporter-otlp-proto-grpc +./opentelemetry-proto +./exporter/opentelemetry-exporter-otlp-proto-common +./exporter/opentelemetry-exporter-otlp-proto-grpc From b42d745da14410cd528f9f2246e94210fd12c190 Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Fri, 8 May 2026 18:02:33 +0200 Subject: [PATCH 6/6] Skip only on pypy since installation of requirements on windows seems to work --- .../test-requirements-constraints.txt | 5 ----- tests/opentelemetry-test-utils/test-requirements.txt | 8 ++++---- tox.ini | 1 - 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 tests/opentelemetry-test-utils/test-requirements-constraints.txt diff --git a/tests/opentelemetry-test-utils/test-requirements-constraints.txt b/tests/opentelemetry-test-utils/test-requirements-constraints.txt deleted file mode 100644 index 53e085ae7a..0000000000 --- a/tests/opentelemetry-test-utils/test-requirements-constraints.txt +++ /dev/null @@ -1,5 +0,0 @@ -# these are required for weaver integration tests, we're running that only on linux / CPython -# because of lack of support for gRPC on Windows in some cases. -opentelemetry-proto ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -opentelemetry-exporter-otlp-proto-common ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' -opentelemetry-exporter-otlp-proto-grpc ; sys_platform != 'win32' and platform_python_implementation != 'PyPy' diff --git a/tests/opentelemetry-test-utils/test-requirements.txt b/tests/opentelemetry-test-utils/test-requirements.txt index 9a3888183c..8d36923bfe 100644 --- a/tests/opentelemetry-test-utils/test-requirements.txt +++ b/tests/opentelemetry-test-utils/test-requirements.txt @@ -14,7 +14,7 @@ zipp==3.19.2 -e opentelemetry-semantic-conventions -e tests/opentelemetry-test-utils # these are required for weaver integration tests, we're running that only on linux / CPython -# because of lack of support for gRPC on Windows in some cases. -./opentelemetry-proto -./exporter/opentelemetry-exporter-otlp-proto-common -./exporter/opentelemetry-exporter-otlp-proto-grpc +# because of lack of support for gRPC wheels on some platforms +./opentelemetry-proto ; platform_python_implementation != 'PyPy' +./exporter/opentelemetry-exporter-otlp-proto-common ; platform_python_implementation != 'PyPy' +./exporter/opentelemetry-exporter-otlp-proto-grpc ; platform_python_implementation != 'PyPy' diff --git a/tox.ini b/tox.ini index 2797c85b65..22bdbbd77d 100644 --- a/tox.ini +++ b/tox.ini @@ -128,7 +128,6 @@ deps = semantic-conventions: -r {toxinidir}/opentelemetry-semantic-conventions/test-requirements.txt - test-utils: -c {toxinidir}/tests/opentelemetry-test-utils/test-requirements-constraints.txt test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt