Merge branch 'main' into upgrade-tox

Author: ocelotl

instrumentation/opentelemetry-instrumentation-urllib/tests/test_metrics_instrumentation.py

@@ -14,7 +14,6 @@
 
 
 from platform import python_implementation
-from sys import version_info
 from timeit import default_timer
 from urllib import request
 from urllib.parse import urlencode
@@ -189,8 +188,7 @@ def test_basic_metric_request_not_empty(self):
             )
 
     @mark.skipif(
-        python_implementation() == "PyPy" or version_info.minor == 7,
-        reason="Fails randomly in 3.7 and pypy",
+        python_implementation() == "PyPy", reason="Fails randomly in pypy"
     )
     def test_metric_uninstrument(self):
         with request.urlopen(self.URL):

tox.ini

@@ -164,7 +164,6 @@ envlist =
     py3{8,9,10,11}-test-instrumentation-grpc
 
     ; opentelemetry-instrumentation-sqlalchemy
-    py3{7}-test-instrumentation-sqlalchemy-{11}
     py3{8,9,10,11}-test-instrumentation-sqlalchemy-{14}
     pypy3-test-instrumentation-sqlalchemy-{11,14}