From 5d73fe233754beda95ba27de82c80bf9d47102f5 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Tue, 17 Oct 2023 23:36:19 +0200 Subject: [PATCH 1/4] pin Pillow<10.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ce67413f410..ab0621338d3 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ def write_version_file(): ] # Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934 -pillow_ver = " >= 5.3.0, !=8.3.*" +pillow_ver = " >= 5.3.0, !=8.3.*, < 10.1" pillow_req = "pillow-simd" if get_dist("pillow-simd") is not None else "pillow" requirements.append(pillow_req + pillow_ver) From f0237bfe6932a8a85f76d07f1cfb912b7b0fe6d4 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 18 Oct 2023 14:03:21 +0200 Subject: [PATCH 2/4] Revert "pin Pillow<10.1" This reverts commit 5d73fe233754beda95ba27de82c80bf9d47102f5. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ab0621338d3..ce67413f410 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ def write_version_file(): ] # Excluding 8.3.* because of https://github.com/pytorch/vision/issues/4934 -pillow_ver = " >= 5.3.0, !=8.3.*, < 10.1" +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) From 7825de3eee0f6ea45a6581f9b0b71f049103d5a8 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 18 Oct 2023 14:05:09 +0200 Subject: [PATCH 3/4] update reference image --- test/assets/fakedata/draw_boxes_util.png | Bin 560 -> 855 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/assets/fakedata/draw_boxes_util.png b/test/assets/fakedata/draw_boxes_util.png index d38f8be78ac72d8d9e3cfeb110bc141c78b645c6..ee5dac329e0407b8066f4295617b29e8933b3a19 100644 GIT binary patch literal 855 zcmeAS@N?(olHy`uVBq!ia0vp^DIm=6pmo+J@Qx&?T7v%BgLBHpl zgk5318ooucQnwD8?Ns0Ud0*W8>x&eAe)@PecE|5$SBf4)W_N9_eM`+UGQs%)Qga|RmZJ?;s)mpQ<_XU4HD=apxk4qX#}eVU-lqK;pd{TE}7zH;;zbY-Y~vVG&* z_bzPNb*%gee8sOL?jMd5xyY*X!*=pUpc(@+Xg>m!k0{%#8A z!`mC`p>70+AF8uyAoStgd)~wCf8$Mb*Gqd@@q)wY5dVkXRYHL0&q{?@1-?ICMza&}4AFkTi z_x^athU>a}BeJcz0`^91=8w_-SbM&!qr{`{MyTuW<#*Rcm0HAKuPkBcVU^(4Xp>*J zt=amoSrAVxU%t|6{Q|cn*CYRu>t8Rt{L`f1)(WNV+e4-+Cg>c9a1cB!&$+$OYW~0X zMRL)Gf4ZH!uH-$uo45Db=f6u*Z%oTFe)?U`{O*s74=>F+uJwW~-gWDA_>9((Q#wRV`Y5xVjFFtdEv+k2VpXRGQeLt>F z?LVOBd?141w_Wz6yawaw8TCeyH%(vZ*hXIeb~H!FDl&IvjrwU`IRmi`8EeWI%Wj92 z{l0!lx@Mnr*bW}SWX5CYc2Qg4z=^#XYWscq%oi{GzG&v(U6DnSOdvaIm{_d?v){Qj R*#lDogQu&X%Q~loCIB`y@F)NP From 9ad5f8141fdfb805f1b619252a28a927566b31c2 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 18 Oct 2023 14:07:43 +0200 Subject: [PATCH 4/4] fix oin in test --- test/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_utils.py b/test/test_utils.py index b13bd0f0f5b..2999e84bf8a 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -105,7 +105,7 @@ def test_draw_boxes(): res = Image.fromarray(result.permute(1, 2, 0).contiguous().numpy()) res.save(path) - if PILLOW_VERSION >= (8, 2): + if PILLOW_VERSION >= (10, 1): # The reference image is only valid for new PIL versions expected = torch.as_tensor(np.array(Image.open(path))).permute(2, 0, 1) assert_equal(result, expected)