Remove [test] package from urllib instrumentation

Fixes open-telemetry#2225
ocelotl · Mar 15, 2024 · cc9f8ab · cc9f8ab
1 parent fbda226
commit cc9f8ab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml b/instrumentation/opentelemetry-instrumentation-urllib/pyproject.toml
@@ -32,10 +32,6 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = []
-test = [
-  "httpretty ~= 1.0",
-  "opentelemetry-test-utils == 0.45b0.dev",
-]
 
 [project.entry-points.opentelemetry_instrumentor]
 urllib = "opentelemetry.instrumentation.urllib:URLLibInstrumentor"

diff --git a/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+httpretty==1.1.4
+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.9.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-instrumentation
+-e util/opentelemetry-util-http
+-e instrumentation/opentelemetry-instrumentation-urllib
diff --git a/tox.ini b/tox.ini
@@ -341,7 +341,7 @@ commands_pre =
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  ,urllib,urllib3v-{1,2}: pip install {toxinidir}/util/opentelemetry-util-http
+  urllib3v-{1,2}: pip install {toxinidir}/util/opentelemetry-util-http
 
   wsgi: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt
 
@@ -362,7 +362,7 @@ commands_pre =
   flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt
   flask-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
 
-  urllib: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
+  urllib: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
 
   urllib3v-{1,2}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
 
@@ -590,7 +590,7 @@ commands_pre =
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3[test]
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
   pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt
-  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib[test]
+  pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
   # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install