Merge branch 'main' into issue_3198

ocelotl · web-flow · commit f50c59a96384 · 2023-08-18T14:15:15.000+02:00
diff --git a/opentelemetry-api/pyproject.toml b/opentelemetry-api/pyproject.toml
@@ -28,7 +28,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",
+    "importlib-metadata >= 6.0, < 7.0",
 ]
 dynamic = [
     "version",

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