Skip to content

Commit 935d407

Browse files
aabmassaabmass
committed
uv pip compile oldest and latest requirements for OTLP gRPC exporter
This uncovered some incompatibilty with oldest versions listed in pyproject.toml which I fixed.
1 parent 4a1ecf0 commit 935d407

File tree

8 files changed

+191
-117
lines changed

8 files changed

+191
-117
lines changed

‎exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ classifiers = [
2727
"Programming Language :: Python :: 3.13",
2828
]
2929
dependencies = [
30-
"googleapis-common-protos ~= 1.52",
30+
"googleapis-common-protos ~= 1.57",
3131
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3232
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3333
"opentelemetry-api ~= 1.15",
3434
"opentelemetry-proto == 1.35.0.dev",
3535
"opentelemetry-sdk ~= 1.35.0.dev",
3636
"opentelemetry-exporter-otlp-proto-common == 1.35.0.dev",
37-
"typing-extensions >= 4.5.0",
37+
"typing-extensions >= 4.6.0",
3838
]
3939

4040
[project.entry-points.opentelemetry_logs_exporter]

‎exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
colorama~=0.4.6
2+
iniconfig~=2.0
3+
pluggy~=1.5
4+
pytest~=7.4
5+
packaging~=24.0
6+
-e opentelemetry-api
7+
-e tests/opentelemetry-test-utils
8+
-e exporter/opentelemetry-exporter-otlp-proto-common
9+
-e opentelemetry-proto
10+
-e opentelemetry-sdk
11+
-e opentelemetry-semantic-conventions
12+
-e exporter/opentelemetry-exporter-otlp-proto-grpc

‎exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.latest.txt‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --python 3.9 --universal -c dev-requirements.txt exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in -o exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.latest.txt
3+
-e exporter/opentelemetry-exporter-otlp-proto-common
4+
# via
5+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
6+
# opentelemetry-exporter-otlp-proto-grpc
7+
-e exporter/opentelemetry-exporter-otlp-proto-grpc
8+
# via -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
9+
-e opentelemetry-api
10+
# via
11+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
12+
# opentelemetry-exporter-otlp-proto-grpc
13+
# opentelemetry-sdk
14+
# opentelemetry-semantic-conventions
15+
# opentelemetry-test-utils
16+
-e opentelemetry-proto
17+
# via
18+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
19+
# opentelemetry-exporter-otlp-proto-common
20+
# opentelemetry-exporter-otlp-proto-grpc
21+
-e opentelemetry-sdk
22+
# via
23+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
24+
# opentelemetry-exporter-otlp-proto-grpc
25+
# opentelemetry-test-utils
26+
-e opentelemetry-semantic-conventions
27+
# via
28+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
29+
# opentelemetry-sdk
30+
-e tests/opentelemetry-test-utils
31+
# via -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
32+
asgiref==3.7.2
33+
# via
34+
# -c dev-requirements.txt
35+
# opentelemetry-test-utils
36+
colorama==0.4.6
37+
# via
38+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
39+
# pytest
40+
exceptiongroup==1.3.0 ; python_full_version < '3.11'
41+
# via pytest
42+
googleapis-common-protos==1.70.0
43+
# via opentelemetry-exporter-otlp-proto-grpc
44+
grpcio==1.73.0
45+
# via opentelemetry-exporter-otlp-proto-grpc
46+
importlib-metadata==8.7.0
47+
# via opentelemetry-api
48+
iniconfig==2.1.0
49+
# via
50+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
51+
# pytest
52+
packaging==24.2
53+
# via
54+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
55+
# pytest
56+
pluggy==1.6.0
57+
# via
58+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
59+
# pytest
60+
protobuf==6.31.1
61+
# via
62+
# googleapis-common-protos
63+
# opentelemetry-proto
64+
pytest==7.4.4
65+
# via
66+
# -c dev-requirements.txt
67+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
68+
tomli==2.2.1 ; python_full_version < '3.11'
69+
# via pytest
70+
typing-extensions==4.14.0
71+
# via
72+
# asgiref
73+
# exceptiongroup
74+
# opentelemetry-api
75+
# opentelemetry-exporter-otlp-proto-grpc
76+
# opentelemetry-sdk
77+
# opentelemetry-semantic-conventions
78+
zipp==3.23.0
79+
# via importlib-metadata

‎exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.oldest.txt‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --python 3.9 --universal --resolution lowest -c dev-requirements.txt exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in -o exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.oldest.txt
3+
-e exporter/opentelemetry-exporter-otlp-proto-common
4+
# via
5+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
6+
# opentelemetry-exporter-otlp-proto-grpc
7+
-e exporter/opentelemetry-exporter-otlp-proto-grpc
8+
# via -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
9+
-e opentelemetry-api
10+
# via
11+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
12+
# opentelemetry-exporter-otlp-proto-grpc
13+
# opentelemetry-sdk
14+
# opentelemetry-semantic-conventions
15+
# opentelemetry-test-utils
16+
-e opentelemetry-proto
17+
# via
18+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
19+
# opentelemetry-exporter-otlp-proto-common
20+
# opentelemetry-exporter-otlp-proto-grpc
21+
-e opentelemetry-sdk
22+
# via
23+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
24+
# opentelemetry-exporter-otlp-proto-grpc
25+
# opentelemetry-test-utils
26+
-e opentelemetry-semantic-conventions
27+
# via
28+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
29+
# opentelemetry-sdk
30+
-e tests/opentelemetry-test-utils
31+
# via -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
32+
asgiref==3.7.2
33+
# via
34+
# -c dev-requirements.txt
35+
# opentelemetry-test-utils
36+
colorama==0.4.6
37+
# via
38+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
39+
# pytest
40+
exceptiongroup==1.0.0 ; python_full_version < '3.11'
41+
# via pytest
42+
googleapis-common-protos==1.63.1
43+
# via opentelemetry-exporter-otlp-proto-grpc
44+
grpcio==1.63.2 ; python_full_version < '3.13'
45+
# via opentelemetry-exporter-otlp-proto-grpc
46+
grpcio==1.66.2 ; python_full_version >= '3.13'
47+
# via opentelemetry-exporter-otlp-proto-grpc
48+
importlib-metadata==6.0.0
49+
# via opentelemetry-api
50+
iniconfig==2.0.0
51+
# via
52+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
53+
# pytest
54+
packaging==24.0
55+
# via
56+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
57+
# pytest
58+
pluggy==1.5.0
59+
# via
60+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
61+
# pytest
62+
protobuf==5.26.0
63+
# via
64+
# googleapis-common-protos
65+
# opentelemetry-proto
66+
pytest==7.4.4
67+
# via
68+
# -c dev-requirements.txt
69+
# -r exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.in
70+
tomli==1.0.0 ; python_full_version < '3.11'
71+
# via pytest
72+
typing-extensions==4.6.0
73+
# via
74+
# asgiref
75+
# opentelemetry-api
76+
# opentelemetry-exporter-otlp-proto-grpc
77+
# opentelemetry-sdk
78+
# opentelemetry-semantic-conventions
79+
zipp==0.5.0
80+
# via importlib-metadata

‎exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎opentelemetry-proto/test-requirements.oldest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile --python 3.9 --universal --resolution lowest-direct -c dev-requirements.txt opentelemetry-proto/test-requirements.in -o opentelemetry-proto/test-requirements.oldest.txt
2+
# uv pip compile --python 3.9 --universal --resolution lowest -c dev-requirements.txt opentelemetry-proto/test-requirements.in -o opentelemetry-proto/test-requirements.oldest.txt
33
-e opentelemetry-proto
44
# via -r opentelemetry-proto/test-requirements.in
55
colorama==0.4.6 ; sys_platform == 'win32'

‎tox.ini‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ envlist =
1010
pypy3-test-opentelemetry-api
1111
lint-opentelemetry-api
1212

13-
py3{9,10,11,12,13}-test-opentelemetry-proto-{oldest,latest}
14-
pypy3-test-opentelemetry-proto-{oldest,latest}
15-
lint-opentelemetry-proto-{oldest,latest}
13+
py3{9,10,11,12,13}-test-opentelemetry-proto-gen-{oldest,latest}
14+
pypy3-test-opentelemetry-proto-gen-{oldest,latest}
15+
lint-opentelemetry-proto-oldest
1616

1717
py3{9,10,11,12,13}-test-opentelemetry-sdk
1818
pypy3-test-opentelemetry-sdk
@@ -47,7 +47,7 @@ envlist =
4747
; intentionally excluded from pypy3
4848
lint-opentelemetry-exporter-otlp-combined
4949

50-
py3{9,10,11,12,13}-test-opentelemetry-exporter-otlp-proto-grpc
50+
py3{9,10,11,12,13}-test-opentelemetry-exporter-otlp-proto-grpc-{oldest,latest}
5151
; intentionally excluded from pypy3
5252
lint-opentelemetry-exporter-otlp-proto-grpc
5353
benchmark-opentelemetry-exporter-otlp-proto-grpc
@@ -111,16 +111,17 @@ deps =
111111

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

114-
opentelemetry-proto-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt
115-
opentelemetry-proto-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt
114+
opentelemetry-proto-gen-oldest: -r {toxinidir}/opentelemetry-proto/test-requirements.oldest.txt
115+
opentelemetry-proto-gen-latest: -r {toxinidir}/opentelemetry-proto/test-requirements.latest.txt
116116

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

119119
exporter-otlp-proto-common: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt
120120

121121
exporter-otlp-combined: -r {toxinidir}/exporter/opentelemetry-exporter-otlp/test-requirements.txt
122122

123-
opentelemetry-exporter-otlp-proto-grpc: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt
123+
opentelemetry-exporter-otlp-proto-grpc-oldest: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.oldest.txt
124+
opentelemetry-exporter-otlp-proto-grpc-latest: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.latest.txt
124125
benchmark-exporter-otlp-proto-grpc: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc/benchmark-requirements.txt
125126

126127
opentelemetry-exporter-otlp-proto-http: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements.txt

0 commit comments

Comments
 (0)