Apply suggestions from code review

Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>

Author: blarghmatey

tox.ini

@@ -116,7 +116,7 @@ envlist =
 
     ; opentelemetry-instrumentation-dbapi
     py3{9,10,11,12,13,14}-test-instrumentation-dbapi-{wrapt1,wrapt2}
-    pypy3-test-instrumentation-dbapi-{wrapt1,wrapt2}
+    pypy3-test-instrumentation-dbapi-wrapt2
     lint-instrumentation-dbapi
 
     ; opentelemetry-instrumentation-boto
@@ -368,7 +368,7 @@ envlist =
     ; 1: httpx>=0.19.0 respx~=0.20.1
     py3{9,10,11,12}-test-instrumentation-httpx-{0,1}-{wrapt1,wrapt2}
     py3{13,14}-test-instrumentation-httpx-1-{wrapt1,wrapt2}
-    pypy3-test-instrumentation-httpx-{0,1}-{wrapt1,wrapt2}
+    pypy3-test-instrumentation-httpx-{0,1}-wrapt2
     lint-instrumentation-httpx
 
     ; opentelemetry-util-http
@@ -402,7 +402,7 @@ envlist =
     ; 0: pika>=0.12.0,<1.0.0
     ; 1: pika>=1.0.0
     py3{9,10,11,12,13,14}-test-instrumentation-sio-pika-{0,1}-{wrapt1,wrapt2}
-    pypy3-test-instrumentation-sio-pika-{0,1}-{wrapt1,wrapt2}
+    pypy3-test-instrumentation-sio-pika-{0,1}-wrapt2
     lint-instrumentation-sio-pika
 
     ; opentelemetry-instrumentation-aio-pika
@@ -470,8 +470,7 @@ deps =
   opentelemetry-instrumentation: {[testenv]test_deps}
   wrapt1: -r {toxinidir}/opentelemetry-instrumentation/test-requirements-wrapt1.txt
   wrapt2: -r {toxinidir}/opentelemetry-instrumentation/test-requirements-wrapt2.txt
-  lint-opentelemetry-instrumentation: -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
-  lint-opentelemetry-instrumentation: Deprecated==1.2.14
+  lint-opentelemetry-instrumentation: -r {toxinidir}/opentelemetry-instrumentation/test-requirements-wrapt2.txt
 
   distro: {[testenv]test_deps}
   distro: -r {toxinidir}/opentelemetry-distro/test-requirements.txt
@@ -528,9 +527,7 @@ deps =
   sio-pika-0-wrapt2: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0-wrapt2.txt
   sio-pika-1-wrapt1: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1-wrapt1.txt
   sio-pika-1-wrapt2: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1-wrapt2.txt
-  lint-instrumentation-sio-pika: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt
-  lint-instrumentation-sio-pika: Deprecated==1.2.14
-  lint-instrumentation-sio-pika: wrapt>=1.0.0,<2.0.0
+lint-instrumentation-sio-pika: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1-wrapt2.txt
 
   aio-pika: {[testenv]test_deps}
   aio-pika-0: -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt