Skip to content

Commit

Permalink
Remove [test] package from psycopg instrumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
ocelotl committed Mar 13, 2024
1 parent 565e78d commit 2644508
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ dependencies = [
instruments = [
"psycopg >= 3.1.0",
]
test = [
"opentelemetry-instrumentation-psycopg[instruments]",
"opentelemetry-test-utils == 0.45b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
psycopg = "opentelemetry.instrumentation.psycopg:PsycopgInstrumentor"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
asgiref==3.7.2
attrs==23.2.0
backports.zoneinfo==0.2.1
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
psycopg==3.1.18
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-dbapi
-e instrumentation/opentelemetry-instrumentation-psycopg
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
psycopg==3.1.18
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-dbapi
-e instrumentation/opentelemetry-instrumentation-psycopg
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,9 @@ commands_pre =

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

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

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

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

0 comments on commit 2644508

Please sign in to comment.