Skip to content

Commit 8519393

Browse files
committed
try fix zipkin tests and docker-tests-proto
Signed-off-by: emdneto <[email protected]>
1 parent 544a2c4 commit 8519393

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

exporter/opentelemetry-exporter-zipkin-proto-http/test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ urllib3==2.2.2
1717
wrapt==1.16.0
1818
zipp==3.19.2
1919
-e opentelemetry-api
20-
-e opentelemetry-proto
2120
-e exporter/opentelemetry-exporter-zipkin-json
2221
-e opentelemetry-sdk
2322
-e tests/opentelemetry-test-utils

tox.ini

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ envlist =
1414
; below mean these dependencies are being used:
1515
; 0: protobuf==3.20.3
1616
; 1: protobuf==4.25.3
17-
py3{8,9,10,11,12}-test-opentelemetry-proto
18-
pypy3-test-opentelemetry-proto
19-
lint-opentelemetry-proto
17+
py3{8,9,10,11,12}-test-opentelemetry-proto-protobuf5
18+
pypy3-test-opentelemetry-proto-protobuf5
19+
lint-opentelemetry-proto-protobuf5
2020

2121
py3{8,9,10,11,12}-test-opentelemetry-sdk
2222
pypy3-test-opentelemetry-sdk
@@ -116,10 +116,10 @@ deps =
116116
lint: -r dev-requirements.txt
117117
coverage: pytest
118118
coverage: pytest-cov
119-
120119
; proto 3 and 4 tests install the respective version of protobuf
121-
proto3: protobuf~=3.19.0
122-
proto4: protobuf~=4.0
120+
; proto3: protobuf~=3.19.0
121+
; proto4: protobuf~=4.0
122+
; proto5: protobuf~=5.26.0
123123

124124
allowlist_externals = sh
125125

@@ -143,8 +143,8 @@ commands_pre =
143143

144144
test-utils: pip install -r {toxinidir}/tests/opentelemetry-test-utils/test-requirements.txt
145145

146-
opentelemetry-proto: pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt
147-
lint-opentelemetry-proto: pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt
146+
opentelemetry-proto-protobuf5: pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt
147+
lint-opentelemetry-proto-protobuf5: pip install -r {toxinidir}/opentelemetry-proto/test-requirements.txt
148148

149149
getting-started: pip install -r {toxinidir}/docs/getting_started/tests/requirements.txt
150150
getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http
@@ -206,11 +206,11 @@ commands =
206206
lint-opentelemetry-sdk: pylint {toxinidir}/opentelemetry-sdk
207207
benchmark-opentelemetry-sdk: pytest {toxinidir}/opentelemetry-sdk/benchmarks --benchmark-json={toxinidir}/opentelemetry-sdk/sdk-benchmark.json {posargs}
208208

209-
test-opentelemetry-proto: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
210-
lint-opentelemetry-proto: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-proto
211-
lint-opentelemetry-proto: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-proto
212-
lint-opentelemetry-proto: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-proto
213-
lint-opentelemetry-proto: pylint {toxinidir}/opentelemetry-proto
209+
test-opentelemetry-proto-protobuf5: pytest {toxinidir}/opentelemetry-proto/tests {posargs}
210+
lint-opentelemetry-proto-protobuf5: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-proto
211+
lint-opentelemetry-proto-protobuf5: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-proto
212+
lint-opentelemetry-proto-protobuf5: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-proto
213+
lint-opentelemetry-proto-protobuf5: pylint {toxinidir}/opentelemetry-proto
214214

215215
test-opentelemetry-semantic-conventions: pytest {toxinidir}/opentelemetry-semantic-conventions/tests {posargs}
216216
lint-opentelemetry-semantic-conventions: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-semantic-conventions
@@ -390,7 +390,7 @@ deps =
390390
requests==2.28.2
391391

392392
; proto 3 and 4 tests install the respective version of protobuf
393-
proto: protobuf==5.26.1
393+
proto: protobuf~=5.26.0
394394

395395
changedir =
396396
tests/opentelemetry-docker-tests/tests
@@ -401,9 +401,8 @@ commands_pre =
401401
-e {toxinidir}/opentelemetry-semantic-conventions \
402402
-e {toxinidir}/opentelemetry-sdk \
403403
-e {toxinidir}/tests/opentelemetry-test-utils \
404-
; opencensus exporter does not work with protobuf 4
405-
proto: -e {toxinidir}/exporter/opentelemetry-exporter-opencensus \
406-
-e {toxinidir}/opentelemetry-proto \
404+
; opencensus exporter does not work with protobuf 4+
405+
proto: -e {toxinidir}/opentelemetry-proto \
407406
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common \
408407
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc \
409408
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http \

0 commit comments

Comments
 (0)