Skip to content

Commit 8323b2b

Browse files
aabmassaabmass
committed
Compile locked requirements with uv
1 parent 1595378 commit 8323b2b

File tree

6 files changed

+194
-37
lines changed

6 files changed

+194
-37
lines changed

‎instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ dependencies = [
3434
]
3535

3636
[project.optional-dependencies]
37-
instruments = [
38-
"starlette ~= 0.13",
39-
]
37+
instruments = ["starlette >= 0.13, <0.15"]
4038

4139
[project.entry-points.opentelemetry_instrumentor]
4240
starlette = "opentelemetry.instrumentation.starlette:StarletteInstrumentor"
@@ -49,10 +47,7 @@ Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
4947
path = "src/opentelemetry/instrumentation/starlette/version.py"
5048

5149
[tool.hatch.build.targets.sdist]
52-
include = [
53-
"/src",
54-
"/tests",
55-
]
50+
include = ["/src", "/tests"]
5651

5752
[tool.hatch.build.targets.wheel]
5853
packages = ["src/opentelemetry"]

‎instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Used to generate test-requirements.{oldest,latest}.txt with uv pip compile
2+
pytest~=7.4
3+
requests~=2.32
4+
httpx~=0.28
5+
-e opentelemetry-instrumentation
6+
-e instrumentation/opentelemetry-instrumentation-asgi
7+
-e util/opentelemetry-util-http
8+
-e instrumentation/opentelemetry-instrumentation-starlette[instruments]

‎instrumentation/opentelemetry-instrumentation-starlette/test-requirements.latest.txt‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --universal --extra instruments instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in -o instrumentation/opentelemetry-instrumentation-starlette/test-requirements.latest.txt
3+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-asgi
4+
# via
5+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
6+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
7+
# opentelemetry-instrumentation-starlette
8+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/opentelemetry-instrumentation
9+
# via
10+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
11+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
12+
# opentelemetry-instrumentation-asgi
13+
# opentelemetry-instrumentation-starlette
14+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/util/opentelemetry-util-http
15+
# via
16+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
17+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
18+
# opentelemetry-instrumentation-asgi
19+
# opentelemetry-instrumentation-starlette
20+
-e instrumentation/opentelemetry-instrumentation-starlette
21+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
22+
anyio==4.8.0
23+
# via httpx
24+
asgiref==3.8.1
25+
# via opentelemetry-instrumentation-asgi
26+
certifi==2025.1.31
27+
# via
28+
# httpcore
29+
# httpx
30+
# requests
31+
charset-normalizer==3.4.1
32+
# via requests
33+
colorama==0.4.6 ; sys_platform == 'win32'
34+
# via pytest
35+
deprecated==1.2.18
36+
# via
37+
# opentelemetry-api
38+
# opentelemetry-semantic-conventions
39+
h11==0.14.0
40+
# via httpcore
41+
httpcore==1.0.7
42+
# via httpx
43+
httpx==0.28.1
44+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
45+
idna==3.10
46+
# via
47+
# anyio
48+
# httpx
49+
# requests
50+
importlib-metadata==8.6.1
51+
# via opentelemetry-api
52+
iniconfig==2.0.0
53+
# via pytest
54+
opentelemetry-api @ git+https://github.com/open-telemetry/opentelemetry-python@9a2e59dfaeb217011d7cf4b8b20b44f0663deba7#subdirectory=opentelemetry-api
55+
# via
56+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
57+
# opentelemetry-instrumentation
58+
# opentelemetry-instrumentation-asgi
59+
# opentelemetry-instrumentation-starlette
60+
# opentelemetry-semantic-conventions
61+
opentelemetry-semantic-conventions @ git+https://github.com/open-telemetry/opentelemetry-python@9a2e59dfaeb217011d7cf4b8b20b44f0663deba7#subdirectory=opentelemetry-semantic-conventions
62+
# via
63+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
64+
# opentelemetry-instrumentation
65+
# opentelemetry-instrumentation-asgi
66+
# opentelemetry-instrumentation-starlette
67+
packaging==24.2
68+
# via
69+
# opentelemetry-instrumentation
70+
# pytest
71+
pluggy==1.5.0
72+
# via pytest
73+
pytest==7.4.4
74+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
75+
requests==2.32.3
76+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
77+
sniffio==1.3.1
78+
# via anyio
79+
starlette==0.14.2
80+
# via
81+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
82+
# opentelemetry-instrumentation-starlette
83+
urllib3==2.3.0
84+
# via requests
85+
wrapt==1.17.2
86+
# via
87+
# deprecated
88+
# opentelemetry-instrumentation
89+
zipp==3.21.0
90+
# via importlib-metadata

‎instrumentation/opentelemetry-instrumentation-starlette/test-requirements.oldest.txt‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile --universal --resolution lowest-direct --extra instruments instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in -o instrumentation/opentelemetry-instrumentation-starlette/test-requirements.oldest.txt
3+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-asgi
4+
# via
5+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
6+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
7+
# opentelemetry-instrumentation-starlette
8+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/opentelemetry-instrumentation
9+
# via
10+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
11+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
12+
# opentelemetry-instrumentation-asgi
13+
# opentelemetry-instrumentation-starlette
14+
-e file:///usr/local/google/home/aaronabbott/repo/opentelemetry-python-contrib/util/opentelemetry-util-http
15+
# via
16+
# -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
17+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
18+
# opentelemetry-instrumentation-asgi
19+
# opentelemetry-instrumentation-starlette
20+
-e instrumentation/opentelemetry-instrumentation-starlette
21+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
22+
anyio==4.8.0
23+
# via httpx
24+
asgiref==3.8.1
25+
# via opentelemetry-instrumentation-asgi
26+
certifi==2025.1.31
27+
# via
28+
# httpcore
29+
# httpx
30+
# requests
31+
charset-normalizer==3.4.1
32+
# via requests
33+
colorama==0.4.6 ; sys_platform == 'win32'
34+
# via pytest
35+
deprecated==1.2.14
36+
# via
37+
# opentelemetry-api
38+
# opentelemetry-semantic-conventions
39+
h11==0.14.0
40+
# via httpcore
41+
httpcore==1.0.7
42+
# via httpx
43+
httpx==0.28.0
44+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
45+
idna==3.10
46+
# via
47+
# anyio
48+
# httpx
49+
# requests
50+
importlib-metadata==8.6.1
51+
# via opentelemetry-api
52+
iniconfig==2.0.0
53+
# via pytest
54+
opentelemetry-api @ git+https://github.com/open-telemetry/opentelemetry-python@9a2e59dfaeb217011d7cf4b8b20b44f0663deba7#subdirectory=opentelemetry-api
55+
# via
56+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
57+
# opentelemetry-instrumentation
58+
# opentelemetry-instrumentation-asgi
59+
# opentelemetry-instrumentation-starlette
60+
# opentelemetry-semantic-conventions
61+
opentelemetry-semantic-conventions @ git+https://github.com/open-telemetry/opentelemetry-python@9a2e59dfaeb217011d7cf4b8b20b44f0663deba7#subdirectory=opentelemetry-semantic-conventions
62+
# via
63+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
64+
# opentelemetry-instrumentation
65+
# opentelemetry-instrumentation-asgi
66+
# opentelemetry-instrumentation-starlette
67+
packaging==24.0
68+
# via
69+
# opentelemetry-instrumentation
70+
# pytest
71+
pluggy==1.5.0
72+
# via pytest
73+
pytest==7.4.4
74+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
75+
requests==2.32.2
76+
# via -r instrumentation/opentelemetry-instrumentation-starlette/test-requirements.in
77+
sniffio==1.3.1
78+
# via anyio
79+
starlette==0.13.8
80+
# via
81+
# opentelemetry-instrumentation-starlette (instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml)
82+
# opentelemetry-instrumentation-starlette
83+
urllib3==2.3.0
84+
# via requests
85+
wrapt==1.16.0
86+
# via
87+
# deprecated
88+
# opentelemetry-instrumentation
89+
zipp==3.21.0
90+
# via importlib-metadata

‎instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt‎

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

‎tox.ini‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ envlist =
175175
lint-instrumentation-requests
176176

177177
; opentelemetry-instrumentation-starlette
178-
py3{8,9,10,11,12,13}-test-instrumentation-starlette
179-
pypy3-test-instrumentation-starlette
178+
py3{8,9,10,11,12,13}-test-instrumentation-starlette-{oldest,latest}
179+
pypy3-test-instrumentation-starlette-{oldest,latest}
180180
lint-instrumentation-starlette
181181

182182
; opentelemetry-instrumentation-jinja2
@@ -612,7 +612,8 @@ deps =
612612
requests: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt
613613

614614
starlette: {[testenv]test_deps}
615-
starlette: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt
615+
starlette-oldest: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.oldest.txt
616+
starlette-latest: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.latest.txt
616617

617618
system-metrics: {[testenv]test_deps}
618619
system-metrics: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt

0 commit comments

Comments
 (0)