Skip to content

Relax protobuf version requirement to support v6 #4620

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Relax protobuf version requirement to support v6 #4620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad23564
Relax protobuf version requirement to support v6
bouk Jun 6, 2025
cd7bcd9
Update test-requirements to protobuf6
bouk Jun 12, 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
2 changes: 1 addition & 1 deletion opentelemetry-proto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"protobuf>=5.0, < 6.0",
"protobuf>=5.0, < 7.0",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-proto/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==5.26.1
protobuf==6.31.1
py-cpuinfo==9.0.0
pytest==7.4.4
tomli==2.0.1
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ envlist =
pypy3-test-opentelemetry-api
lint-opentelemetry-api

py3{9,10,11,12,13}-test-opentelemetry-proto-protobuf5
pypy3-test-opentelemetry-proto-protobuf5
lint-opentelemetry-proto-protobuf5
py3{9,10,11,12,13}-test-opentelemetry-proto-protobuf6
pypy3-test-opentelemetry-proto-protobuf6
lint-opentelemetry-proto-protobuf6

py3{9,10,11,12,13}-test-opentelemetry-sdk
pypy3-test-opentelemetry-sdk
Expand Down Expand Up @@ -111,7 +111,7 @@ deps =

test-utils: -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt

opentelemetry-proto-protobuf5: -r {toxinidir}/opentelemetry-proto/test-requirements.txt
opentelemetry-proto-protobuf6: -r {toxinidir}/opentelemetry-proto/test-requirements.txt

exporter-opencensus: -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt

Expand Down Expand Up @@ -169,8 +169,8 @@ commands =
lint-opentelemetry-sdk: pylint {toxinidir}/opentelemetry-sdk
benchmark-opentelemetry-sdk: pytest {toxinidir}/opentelemetry-sdk/benchmarks --benchmark-json={toxinidir}/opentelemetry-sdk/sdk-benchmark.json {posargs}

test-opentelemetry-proto-protobuf5: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
lint-opentelemetry-proto-protobuf5: pylint {toxinidir}/opentelemetry-proto
test-opentelemetry-proto-protobuf6: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
lint-opentelemetry-proto-protobuf6: pylint {toxinidir}/opentelemetry-proto

test-opentelemetry-semantic-conventions: pytest {toxinidir}/opentelemetry-semantic-conventions/tests {posargs}
lint-opentelemetry-semantic-conventions: pylint {toxinidir}/opentelemetry-semantic-conventions
Expand Down