Merge branch 'main' into prototype/multiweight_refactoring

datumbox · web-flow · commit 4299eb30fab9 · 2021-11-16T15:20:55.000Z
diff --git a/setup.py b/setup.py
@@ -62,8 +62,8 @@ def write_version_file():
     pytorch_dep,
 ]
 
-# Excluding 8.3.0 because of https://github.com/pytorch/vision/issues/4146
-pillow_ver = " >= 5.3.0, !=8.3.0"
+# Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934
+pillow_ver = " >= 5.3.0, !=8.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
`@@ -62,8 +62,8 @@ def write_version_file():`
`62`	`62`	`pytorch_dep,`
`63`	`63`	`]`
`64`	`64`
`65`		`-# Excluding 8.3.0 because of https://github.com/pytorch/vision/issues/4146`
`66`		`-pillow_ver = " >= 5.3.0, !=8.3.0"`
	`65`	`+# Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934`
	`66`	`+pillow_ver = " >= 5.3.0, !=8.3.*"`
`67`	`67`	`pillow_req = "pillow-simd" if get_dist("pillow-simd") is not None else "pillow"`
`68`	`68`	`requirements.append(pillow_req + pillow_ver)`
`69`	`69`