Skip to content

Commit 0030649

Browse files
committed
Remove [test] package from falcon instrumentation
Fixes #2200
1 parent d948f21 commit 0030649

File tree

5 files changed

+76
-14
lines changed

5 files changed

+76
-14
lines changed

instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ dependencies = [
3636
instruments = [
3737
"falcon >= 1.4.1, < 3.1.2",
3838
]
39-
test = [
40-
"opentelemetry-instrumentation-falcon[instruments]",
41-
"opentelemetry-test-utils == 0.45b0.dev",
42-
]
4339

4440
[project.entry-points.opentelemetry_instrumentor]
4541
falcon = "opentelemetry.instrumentation.falcon:FalconInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==1.4.1
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
python-mimeparse==1.6.0
14+
six==1.16.0
15+
tomli==2.0.1
16+
typing_extensions==4.10.0
17+
wrapt==1.16.0
18+
zipp==3.17.0
19+
-e opentelemetry-instrumentation
20+
-e instrumentation/opentelemetry-instrumentation-wsgi
21+
-e util/opentelemetry-util-http
22+
-e instrumentation/opentelemetry-instrumentation-falcon
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==2.0.0
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-wsgi
19+
-e util/opentelemetry-util-http
20+
-e instrumentation/opentelemetry-instrumentation-falcon
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
falcon==3.1.1
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.10.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-wsgi
19+
-e util/opentelemetry-util-http
20+
-e instrumentation/opentelemetry-instrumentation-falcon

tox.ini

+14-10
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,14 @@ envlist =
7474

7575
; opentelemetry-instrumentation-falcon
7676
; py310 does not work with falcon 1
77-
py3{8,9}-test-instrumentation-falcon-1
78-
py3{8,9,10,11}-test-instrumentation-falcon-{2,3}
79-
pypy3-test-instrumentation-falcon-{1,2,3}
77+
; The numbers at the end of the environment names
78+
; below mean these dependencies are being used:
79+
; 0: falcon ==1.4.1
80+
; 1: falcon >=2.0.0,<3.0.0
81+
; 2: falcon >=3.0.0,<4.0.0
82+
py3{8,9}-test-instrumentation-falcon-0
83+
py3{8,9,10,11}-test-instrumentation-falcon-{1,2}
84+
pypy3-test-instrumentation-falcon-{0,1,2}
8085

8186
; opentelemetry-instrumentation-fastapi
8287
py3{8,9,10,11}-test-instrumentation-fastapi
@@ -279,9 +284,6 @@ deps =
279284
; elasticsearch-7: elasticsearch>=7.0,<8.0
280285
; elasticsearch-8: elasticsearch-dsl>=8.0,<9.0
281286
; elasticsearch-8: elasticsearch>=8.0,<9.0
282-
falcon-1: falcon ==1.4.1
283-
falcon-2: falcon >=2.0.0,<3.0.0
284-
falcon-3: falcon >=3.0.0,<4.0.0
285287
grpc: pytest-asyncio
286288
sqlalchemy-11: sqlalchemy>=1.1,<1.2
287289
sqlalchemy-14: aiosqlite
@@ -338,8 +340,8 @@ commands_pre =
338340

339341
grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
340342

341-
falcon-{1,2,3},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
342-
wsgi,falcon-{1,2,3},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
343+
django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
344+
wsgi,django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
343345
django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi
344346

345347
asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
@@ -351,7 +353,9 @@ commands_pre =
351353

352354
boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
353355

354-
falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
356+
falcon-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
357+
falcon-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
358+
falcon-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
355359

356360
flask-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt
357361
flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt
@@ -547,7 +551,7 @@ commands_pre =
547551
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
548552
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
549553
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
550-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
554+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
551555
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
552556
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
553557
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]

0 commit comments

Comments
 (0)