Remove [test] package from falcon instrumentation

Fixes open-telemetry#2200
ocelotl · Feb 28, 2024 · edea9b0 · edea9b0
1 parent 8daa8ad
commit edea9b0
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 15 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml b/instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
@@ -36,10 +36,6 @@ dependencies = [
 instruments = [
   "falcon >= 1.4.1, < 3.1.2",
 ]
-test = [
-  "opentelemetry-instrumentation-falcon[instruments]",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 falcon = "opentelemetry.instrumentation.falcon:FalconInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
@@ -0,0 +1,22 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+falcon==1.4.1
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+python-mimeparse==1.6.0
+six==1.16.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e ../../../opentelemetry-instrumentation
+-e ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-falcon
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
@@ -0,0 +1,20 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+falcon==2.0.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+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 ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-falcon
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
@@ -0,0 +1,20 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+falcon==3.1.1
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+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 ../../../util/opentelemetry-util-http
+-e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+-e ../../../instrumentation/opentelemetry-instrumentation-falcon
diff --git a/tox.ini b/tox.ini
@@ -74,9 +74,9 @@ envlist =
 
     ; opentelemetry-instrumentation-falcon
     ; py310 does not work with falcon 1
-    py3{8,9}-test-instrumentation-falcon-1
-    py3{8,9,10,11}-test-instrumentation-falcon-{2,3}
-    pypy3-test-instrumentation-falcon-{1,2,3}
+    py3{8,9}-test-instrumentation-falcon-0
+    py3{8,9,10,11}-test-instrumentation-falcon-{1,2}
+    pypy3-test-instrumentation-falcon-{0,1,2}
 
     ; opentelemetry-instrumentation-fastapi
     py3{8,9,10,11}-test-instrumentation-fastapi
@@ -269,9 +269,6 @@ deps =
   ; elasticsearch-7: elasticsearch>=7.0,<8.0
   ; elasticsearch-8: elasticsearch-dsl>=8.0,<9.0
   ; elasticsearch-8: elasticsearch>=8.0,<9.0
-  falcon-1: falcon ==1.4.1
-  falcon-2: falcon >=2.0.0,<3.0.0
-  falcon-3: falcon >=3.0.0,<4.0.0
   flask-213: Flask ==2.1.3
   flask-213: Werkzeug <3.0.0
   flask-220: Flask ==2.2.0
@@ -325,7 +322,7 @@ changedir =
   test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
   test-instrumentation-django-{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
   test-instrumentation-elasticsearch-{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
-  test-instrumentation-falcon-{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
+  test-instrumentation-falcon-{0,1,2}: instrumentation/opentelemetry-instrumentation-falcon/tests
   test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
   test-instrumentation-flask-{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
   test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
@@ -391,8 +388,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]
+  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,flask-{213,220,300},django-{1,2,3,4},pyramid: 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]
@@ -404,7 +401,9 @@ commands_pre =
 
   boto3sqs: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs[test]
 
-  falcon-{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
+  falcon-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
+  falcon-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
+  falcon-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
 
   flask-{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
 
@@ -545,7 +544,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-django[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]