Skip to content

Commit b782d38

Browse files
committed
Remove [test] package from sqlalchemy instrumentation
Fixes open-telemetry#2219
1 parent 8f02162 commit b782d38

File tree

4 files changed

+51
-12
lines changed

4 files changed

+51
-12
lines changed

instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml

-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ dependencies = [
3535
instruments = [
3636
"sqlalchemy",
3737
]
38-
test = [
39-
"opentelemetry-instrumentation-sqlalchemy[instruments]",
40-
"opentelemetry-sdk ~= 1.12",
41-
"pytest",
42-
]
4338

4439
[project.entry-points.opentelemetry_instrumentor]
4540
sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
cffi==1.15.1
4+
Deprecated==1.2.14
5+
greenlet==0.4.13
6+
hpy==0.0.4.dev179+g9b5d200
7+
importlib-metadata==6.11.0
8+
iniconfig==2.0.0
9+
packaging==23.2
10+
pluggy==1.4.0
11+
py==1.11.0
12+
py-cpuinfo==9.0.0
13+
pytest==7.1.3
14+
pytest-benchmark==4.0.0
15+
readline==6.2.4.1
16+
SQLAlchemy==1.1.18
17+
tomli==2.0.1
18+
typing_extensions==4.10.0
19+
wrapt==1.16.0
20+
zipp==3.17.0
21+
-e opentelemetry-instrumentation
22+
-e instrumentation/opentelemetry-instrumentation-sqlalchemy
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
aiosqlite==0.20.0
2+
asgiref==3.7.2
3+
attrs==23.2.0
4+
Deprecated==1.2.14
5+
greenlet==3.0.3
6+
importlib-metadata==6.11.0
7+
iniconfig==2.0.0
8+
packaging==23.2
9+
pluggy==1.4.0
10+
py==1.11.0
11+
py-cpuinfo==9.0.0
12+
pytest==7.1.3
13+
pytest-benchmark==4.0.0
14+
SQLAlchemy==1.4.51
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-sqlalchemy

tox.ini

+9-7
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,12 @@ envlist =
207207
pypy3-test-instrumentation-grpc
208208

209209
; opentelemetry-instrumentation-sqlalchemy
210-
py3{8,9,10,11}-test-instrumentation-sqlalchemy-{14}
211-
pypy3-test-instrumentation-sqlalchemy-{11,14}
210+
; The numbers at the end of the environment names
211+
; below mean these dependencies are being used:
212+
; 0: sqlalchemy>=1.1,<1.2
213+
; 1: sqlalchemy~=1.4 aiosqlite
214+
py3{8,9,10,11}-test-instrumentation-sqlalchemy-{1}
215+
pypy3-test-instrumentation-sqlalchemy-{0,1}
212216

213217
; opentelemetry-instrumentation-redis
214218
py3{8,9,10,11}-test-instrumentation-redis
@@ -296,9 +300,6 @@ deps =
296300
coverage: pytest
297301
coverage: pytest-cov
298302
grpc: pytest-asyncio
299-
sqlalchemy-11: sqlalchemy>=1.1,<1.2
300-
sqlalchemy-14: aiosqlite
301-
sqlalchemy-14: sqlalchemy~=1.4
302303
sio-pika-0: pika>=0.12.0,<1.0.0
303304
sio-pika-1: pika>=1.0.0
304305

@@ -434,7 +435,8 @@ commands_pre =
434435

435436
sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]
436437

437-
sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
438+
sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
439+
sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
438440

439441
elasticsearch-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
440442
elasticsearch-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
@@ -572,7 +574,7 @@ commands_pre =
572574
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
573575
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
574576
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
575-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
577+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
576578
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
577579
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
578580
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]

0 commit comments

Comments
 (0)