Remove [test] packages from instrumentations

Fixes open-telemetry#2126

instrumentation/opentelemetry-instrumentation-flask/pyproject.toml

@@ -35,14 +35,8 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "werkzeug < 3.0.0",
   "flask >= 1.0",
 ]
-test = [
-  "opentelemetry-instrumentation-flask[instruments]",
-  "markupsafe==2.1.2",
-  "opentelemetry-test-utils == 0.44b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 flask = "opentelemetry.instrumentation.flask:FlaskInstrumentor"

instrumentation/opentelemetry-instrumentation-flask/test-0

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pip install -e ../../../opentelemetry-instrumentation
+pip install -e ../../../util/opentelemetry-util-http
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+pip install "flask==2.1.3"
+pip install "werkzeug<3.0.0"
+
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-flask
+
+pip freeze

instrumentation/opentelemetry-instrumentation-flask/test-1

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pip install -e ../../../opentelemetry-instrumentation
+pip install -e ../../../util/opentelemetry-util-http
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+pip install "flask==2.2.0"
+pip install "werkzeug<3.0.0"
+
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-flask
+
+pip freeze

instrumentation/opentelemetry-instrumentation-flask/test-2

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pip install -e ../../../opentelemetry-instrumentation
+pip install -e ../../../util/opentelemetry-util-http
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-wsgi
+pip install "flask>=3.0.0"
+pip install "werkzeug>=3.0.0"
+
+pip install -e ../../../instrumentation/opentelemetry-instrumentation-flask
+
+pip freeze

tox.ini

@@ -88,9 +88,9 @@ envlist =
     pypy3-test-instrumentation-fastapi
 
     ; opentelemetry-instrumentation-flask
-    py3{7,8,9,10,11}-test-instrumentation-flask{213,220}
-    py3{8,9,10,11}-test-instrumentation-flask{300}
-    pypy3-test-instrumentation-flask{213,220}
+    py3{7,8,9,10,11}-test-instrumentation-flask{0,1}
+    py3{8,9,10,11}-test-instrumentation-flask{2}
+    pypy3-test-instrumentation-flask{0,1}
 
     ; opentelemetry-instrumentation-urllib
     py3{7,8,9,10,11}-test-instrumentation-urllib
@@ -273,12 +273,6 @@ deps =
   falcon1: falcon ==1.4.1
   falcon2: falcon >=2.0.0,<3.0.0
   falcon3: falcon >=3.0.0,<4.0.0
-  flask213: Flask ==2.1.3
-  flask213: Werkzeug <3.0.0
-  flask220: Flask ==2.2.0
-  flask220: Werkzeug <3.0.0
-  flask300: Flask >=3.0.0
-  flask300: Werkzeug >=3.0.0
   grpc: pytest-asyncio
   sqlalchemy11: sqlalchemy>=1.1,<1.2
   sqlalchemy14: aiosqlite
@@ -329,7 +323,7 @@ changedir =
   test-instrumentation-elasticsearch{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
   test-instrumentation-falcon{1,2,3}: 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-flask{0,1,2}: instrumentation/opentelemetry-instrumentation-flask/tests
   test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
   test-instrumentation-urllib3v{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
   test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
@@ -391,8 +385,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[test]
-  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},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[test]
+  wsgi,falcon{1,2,3},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]
@@ -406,7 +400,9 @@ commands_pre =
 
   falcon{1,2,3}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon[test]
 
-  flask{213,220,300}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
+  flask0: {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-0
+  flask1: {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-1
+  flask2: {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-2
 
   urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
 
@@ -543,7 +539,7 @@ commands_pre =
   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-boto[test]
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]