Merge branch 'main' into disable-int-rbbox

NicolasHug · web-flow · commit 6fd0d515b28e · 2025-07-01T11:23:01.000+01:00
diff --git a/setup.py b/setup.py
@@ -111,7 +111,8 @@ def get_dist(pkgname):
     ]
 
     # Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934
-    pillow_ver = " >= 5.3.0, !=8.3.*"
+    # TODO remove <11.3 bound and address corresponding deprecation warnings
+    pillow_ver = " >= 5.3.0, !=8.3.*, <11.3"
     pillow_req = "pillow-simd" if get_dist("pillow-simd") is not None else "pillow"
     requirements.append(pillow_req + pillow_ver)
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ def get_dist(pkgname):`
`111`	`111`	`]`
`112`	`112`
`113`	`113`	`# Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934`
`114`		`- pillow_ver = " >= 5.3.0, !=8.3.*"`
	`114`	`+ # TODO remove <11.3 bound and address corresponding deprecation warnings`
	`115`	`+ pillow_ver = " >= 5.3.0, !=8.3.*, <11.3"`
`115`	`116`	`pillow_req = "pillow-simd" if get_dist("pillow-simd") is not None else "pillow"`
`116`	`117`	`requirements.append(pillow_req + pillow_ver)`
`117`	`118`