Merge branch 'main' into 3184-support-for-env-var-otel-sdk-disabled

lzchen · web-flow · commit 43fd85b67da2 · 2024-03-14T15:27:56.000-07:00
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -27,7 +27,7 @@ dependencies = [
     "Deprecated >= 1.2.6",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, < 7.0",
+    "importlib-metadata >= 6.0, <= 7.0",
 ]
 dynamic = [
     "version",

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies = [`
`27`	`27`	`"Deprecated >= 1.2.6",`
`28`	`28`	`# FIXME This should be able to be removed after 3.12 is released if there is a reliable API`
`29`	`29`	`# in importlib.metadata.`
`30`		`- "importlib-metadata >= 6.0, < 7.0",`
	`30`	`+ "importlib-metadata >= 6.0, <= 7.0",`
`31`	`31`	`]`
`32`	`32`	`dynamic = [`
`33`	`33`	`"version",`