Merge branch 'main' into brettlangdon/dd-trace-py.pipeline.artifacts

brettlangdon · web-flow · commit 0d068fa9675e · 2026-03-18T15:46:52.000-04:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ datadog = ">=0.51.0,<1.0.0"
 wrapt = "^1.11.2"
 ddtrace = [
     {version = ">=3.19.1,<4", python = ">=3.8,<3.10"},
-    {version = ">=4.1.1,<5", python = ">=3.10"}
+    {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"}
 ]
 ujson = ">=5.9.0"
 botocore = { version = "^1.34.0", optional = true }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ datadog = ">=0.51.0,<1.0.0"`
`31`	`31`	`wrapt = "^1.11.2"`
`32`	`32`	`ddtrace = [`
`33`	`33`	`{version = ">=3.19.1,<4", python = ">=3.8,<3.10"},`
`34`		`- {version = ">=4.1.1,<5", python = ">=3.10"}`
	`34`	`+ {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"}`
`35`	`35`	`]`
`36`	`36`	`ujson = ">=5.9.0"`
`37`	`37`	`botocore = { version = "^1.34.0", optional = true }`