Remove [test] package from pyramid instrumentation

Fixes open-telemetry#2214
ocelotl · Mar 13, 2024 · a733ca6 · a733ca6
1 parent 565e78d
commit a733ca6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml b/instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml
@@ -36,11 +36,6 @@ dependencies = [
 instruments = [
   "pyramid >= 1.7",
 ]
-test = [
-  "opentelemetry-instrumentation-pyramid[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-  "werkzeug == 0.16.1",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 pyramid = "opentelemetry.instrumentation.pyramid:PyramidInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
@@ -0,0 +1,30 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+hupper==1.12.1
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+PasteDeploy==3.1.0
+plaster==1.1.2
+plaster-pastedeploy==1.0.1
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pyramid==2.0.2
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+translationstring==1.4
+typing_extensions==4.9.0
+venusian==3.1.0
+WebOb==1.8.7
+Werkzeug==0.16.1
+wrapt==1.16.0
+zipp==3.17.0
+zope.deprecation==5.0
+zope.interface==6.2
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-wsgi
+-e instrumentation/opentelemetry-instrumentation-pyramid
diff --git a/tox.ini b/tox.ini
@@ -333,8 +333,8 @@ commands_pre =
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
-  wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
+  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
+  wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
   asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
 
   asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
@@ -378,7 +378,7 @@ commands_pre =
 
   pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
 
-  pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid[test]
+  pyramid: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
 
   sqlite3: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
 
@@ -565,7 +565,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-requests[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]