lint

Author: jeremydvoss

opentelemetry-instrumentation/src/opentelemetry/instrumentation/dependencies.py

@@ -126,7 +126,7 @@ def get_dist_dependency_conflicts(
 def get_dependency_conflicts(
     deps: Collection[
         str | Requirement
-    ],  # Depedencies all of which are required
+    ],  # Dependenciesall of which are required
     deps_either: Collection[
         str | Requirement
     ] = [],  # Dependencies any of which are required
@@ -192,7 +192,7 @@ def get_dependency_conflicts(
 
             if req.specifier.contains(dist_version):
                 is_dependency_conflict = False
-                # Since only one of the instrumentation_either dependencies is required, there is no depdendency conflict.
+                # Since only one of the instrumentation_either dependencies is required, there is no dependency conflict.
                 break
             else:
                 required_either.append(str(dep))

opentelemetry-instrumentation/tests/test_dependencies.py

@@ -132,8 +132,7 @@ def version_side_effect(package_name):
                 raise PackageNotFoundError("foo not found")
             elif package_name == "bar":
                 return "1.0.0"
-            else:
-                raise PackageNotFoundError(f"{package_name} not found")
+            raise PackageNotFoundError(f"{package_name} not found")
 
         version_mock.side_effect = version_side_effect
         conflict = get_dist_dependency_conflicts(dist)
@@ -195,8 +194,7 @@ def version_side_effect(package_name):
                 raise PackageNotFoundError("bar not found")
             elif package_name == "baz":
                 return "3.7.0"
-            else:
-                raise PackageNotFoundError(f"{package_name} not found")
+            raise PackageNotFoundError(f"{package_name} not found")
 
         version_mock.side_effect = version_side_effect
         conflict = get_dist_dependency_conflicts(dist)
@@ -232,8 +230,7 @@ def version_side_effect(package_name):
                 raise PackageNotFoundError("bar not found")
             elif package_name == "baz":
                 return "3.7.0"
-            else:
-                raise PackageNotFoundError(f"{package_name} not found")
+            raise PackageNotFoundError(f"{package_name} not found")
 
         version_mock.side_effect = version_side_effect
         conflict = get_dist_dependency_conflicts(dist)
@@ -274,8 +271,7 @@ def version_side_effect(package_name):
                 raise PackageNotFoundError("bar not found")
             elif package_name == "baz":
                 raise PackageNotFoundError("baz not found")
-            else:
-                raise PackageNotFoundError(f"{package_name} not found")
+            raise PackageNotFoundError(f"{package_name} not found")
 
         version_mock.side_effect = version_side_effect
         conflict = get_dist_dependency_conflicts(dist)