Skip to content

Commit f07e605

Browse files
committed
Remove [test] package from psycopg2 instrumentation
Fixes open-telemetry#2210
1 parent 46a8c59 commit f07e605

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ dependencies = [
3333
instruments = [
3434
"psycopg2 >= 2.7.3.1",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-psycopg2[instruments]",
38-
"opentelemetry-test-utils == 0.45b0.dev",
39-
]
4036

4137
[project.entry-points.opentelemetry_instrumentor]
4238
psycopg2 = "opentelemetry.instrumentation.psycopg2:Psycopg2Instrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pluggy==1.4.0
8+
psycopg2==2.9.9
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-dbapi
19+
-e instrumentation/opentelemetry-instrumentation-psycopg2

tox.ini

+3-3
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ commands_pre =
374374

375375
psycopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
376376

377-
psycopg2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
377+
psycopg2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
378378

379379
pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
380380

@@ -560,7 +560,7 @@ commands_pre =
560560
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
561561
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
562562
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
563-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
563+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
564564
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
565565
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
566566
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
@@ -608,7 +608,7 @@ deps =
608608
# see https://www.psycopg.org/docs/install.html#build-prerequisites
609609
# you might have to install additional packages depending on your OS
610610
psycopg ~= 3.1.17
611-
psycopg2 ~= 2.9.5
611+
psycopg2==2.9.9
612612
aiopg >= 0.13.0, < 1.3.0
613613
sqlalchemy ~= 1.4
614614
redis ~= 4.3

0 commit comments

Comments
 (0)