Skip to content

Commit 7288087

Browse files
committed
Remove [test] package from psycopg instrumentation
Fixes #2308
1 parent 46a8c59 commit 7288087

File tree

4 files changed

+44
-7
lines changed

4 files changed

+44
-7
lines changed

instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ dependencies = [
3434
instruments = [
3535
"psycopg >= 3.1.0",
3636
]
37-
test = [
38-
"opentelemetry-instrumentation-psycopg[instruments]",
39-
"opentelemetry-test-utils == 0.45b0.dev",
40-
]
4137

4238
[project.entry-points.opentelemetry_instrumentor]
4339
psycopg = "opentelemetry.instrumentation.psycopg:PsycopgInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
backports.zoneinfo==0.2.1
4+
Deprecated==1.2.14
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
psycopg==3.1.18
10+
py==1.11.0
11+
py-cpuinfo==9.0.0
12+
pytest==7.1.3
13+
pytest-benchmark==4.0.0
14+
tomli==2.0.1
15+
typing_extensions==4.10.0
16+
wrapt==1.16.0
17+
zipp==3.17.0
18+
-e opentelemetry-instrumentation
19+
-e instrumentation/opentelemetry-instrumentation-dbapi
20+
-e instrumentation/opentelemetry-instrumentation-psycopg
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+
psycopg==3.1.18
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-psycopg

tox.ini

+5-3
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,9 @@ commands_pre =
372372

373373
pymongo: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
374374

375-
psycopg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
375+
py3{8,9}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt
376+
py3{10,11}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
377+
pypy3-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
376378

377379
psycopg2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
378380

@@ -559,7 +561,7 @@ commands_pre =
559561
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
560562
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
561563
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache[test]
562-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg[test]
564+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt
563565
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2[test]
564566
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
565567
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
@@ -607,7 +609,7 @@ deps =
607609
# prerequisite: install libpq-dev (debian) or postgresql-devel (rhel), postgresql (mac)
608610
# see https://www.psycopg.org/docs/install.html#build-prerequisites
609611
# you might have to install additional packages depending on your OS
610-
psycopg ~= 3.1.17
612+
psycopg==3.1.18
611613
psycopg2 ~= 2.9.5
612614
aiopg >= 0.13.0, < 1.3.0
613615
sqlalchemy ~= 1.4

0 commit comments

Comments
 (0)