Update pillow

jacebrowning · May 2, 2021 · b17a8c3 · b17a8c3
1 parent 14cfda8
commit b17a8c3
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 45 deletions.
diff --git a/...f3d1/_/This_should_not_be_rotated!.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...f3d1/_/This_should_not_be_rotated!.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...cca9e0cdb203f/_/My_Custom_Template.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...cca9e0cdb203f/_/My_Custom_Template.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...cca9e0cdb203f/_/My_Custom_Template.d2e6158e772baf9722a0500ec2f27ee9abe24900.png b/...cca9e0cdb203f/_/My_Custom_Template.d2e6158e772baf9722a0500ec2f27ee9abe24900.png
diff --git a/...sts/images/_error/UNKNOWN_TEMPLATE.54fadab08cf64e6b1f29c346b201e5c472541817.png b/...sts/images/_error/UNKNOWN_TEMPLATE.54fadab08cf64e6b1f29c346b201e5c472541817.png
diff --git a/...utton./can't_decide_which_is_worse.10a509e0f2f0f95790bfef21838c06af9e805464.png b/...utton./can't_decide_which_is_worse.10a509e0f2f0f95790bfef21838c06af9e805464.png
diff --git a/app/tests/images/ds/one/two/three.337546bff2d3e1c6699e35d208ee13210bfcb5d9.png b/app/tests/images/ds/one/two/three.337546bff2d3e1c6699e35d208ee13210bfcb5d9.png
diff --git a/...this_button_seems_to_be_ok_to_push.10a509e0f2f0f95790bfef21838c06af9e805464.png b/...this_button_seems_to_be_ok_to_push.10a509e0f2f0f95790bfef21838c06af9e805464.png
diff --git a/...ts/images/fine/102_°F/this_is_fine.d823407f303865640763b4eafdaf75eeae5129b5.png b/...ts/images/fine/102_°F/this_is_fine.d823407f303865640763b4eafdaf75eeae5129b5.png
diff --git a/...is_will_probably_be_fine_right_now.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...is_will_probably_be_fine_right_now.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...text_than_the_short_one/short_line.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...text_than_the_short_one/short_line.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...er_line_of_text_than_the_short_one.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...er_line_of_text_than_the_short_one.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...ese--memes/template__rating:_9~s10.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...ese--memes/template__rating:_9~s10.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/app/tests/images/icanhas/height=250.6ac59ced55ee4467d844bc3cfe0702a058ea1d57.png b/app/tests/images/icanhas/height=250.6ac59ced55ee4467d844bc3cfe0702a058ea1d57.png
diff --git a/app/tests/images/icanhas/height=500.08471cc516e04a9f5c5ed222aa5516929ecfedb4.png b/app/tests/images/icanhas/height=500.08471cc516e04a9f5c5ed222aa5516929ecfedb4.png
diff --git a/...anhas/nominal_image/with_watermark.6cbae4e823747863895819bd81db0ff75654bc58.png b/...anhas/nominal_image/with_watermark.6cbae4e823747863895819bd81db0ff75654bc58.png
diff --git a/...anhas/paddded_image/with_watermark.97fb24b48a8d574add0d2ca24c3e8f193e728f54.png b/...anhas/paddded_image/with_watermark.97fb24b48a8d574add0d2ca24c3e8f193e728f54.png
diff --git a/...ll_image/with_watermark_(disabled).e918073cdcd711d6f3c4d191097af0d8c276cf6b.png b/...ll_image/with_watermark_(disabled).e918073cdcd711d6f3c4d191097af0d8c276cf6b.png
diff --git a/...ges/icanhas/width=2000/height=2000.fe0d51348025a14592b88268c4ac3a201499ef80.png b/...ges/icanhas/width=2000/height=2000.fe0d51348025a14592b88268c4ac3a201499ef80.png
diff --git a/app/tests/images/icanhas/width=250.d206385a1fb37783134258f557f9067a5c87ea48.png b/app/tests/images/icanhas/width=250.d206385a1fb37783134258f557f9067a5c87ea48.png
diff --git a/...mages/icanhas/width=400/height=600.7cd5d80be13525ca57493186813ab41013b460fc.png b/...mages/icanhas/width=400/height=600.7cd5d80be13525ca57493186813ab41013b460fc.png
diff --git a/.../images/icanhas/width=50/height=50.1aec4cde925fc4ea8f8552887ed94407dece3276.png b/.../images/icanhas/width=50/height=50.1aec4cde925fc4ea8f8552887ed94407dece3276.png
diff --git a/app/tests/images/icanhas/width=500.ad1b3938829ea7bfba12a0b157367a903c871330.png b/app/tests/images/icanhas/width=500.ad1b3938829ea7bfba12a0b157367a903c871330.png
diff --git a/...mages/icanhas/width=600/height=400.0c21fd26e7afbaf22f9d79335782dcd9c7d15711.png b/...mages/icanhas/width=600/height=400.0c21fd26e7afbaf22f9d79335782dcd9c7d15711.png
diff --git a/...images/iw/tests_code/in_production.c267526a598d75aa7816cc6690545ab7a12847c8.jpg b/...images/iw/tests_code/in_production.c267526a598d75aa7816cc6690545ab7a12847c8.jpg
diff --git a/...images/iw/tests_code/in_production.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...images/iw/tests_code/in_production.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...w/tests_code/in_production_(debug).c267526a598d75aa7816cc6690545ab7a12847c8.png b/...w/tests_code/in_production_(debug).c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...mages/pigeon/_/multiple_words_here.9f3d1bd57a554f8c93ac5efeb558a628aaaf6584.png b/...mages/pigeon/_/multiple_words_here.9f3d1bd57a554f8c93ac5efeb558a628aaaf6584.png
diff --git a/app/tests/images/preview.jpg b/app/tests/images/preview.jpg
diff --git a/...o/Exit_the_monorepo./Stop_testing!.d9518421201fd8e92daf5c1ae8ee53912ebcd9db.png b/...o/Exit_the_monorepo./Stop_testing!.d9518421201fd8e92daf5c1ae8ee53912ebcd9db.png
diff --git a/...termark./Doesn't_have_a_watermark!.29bec8d820bc50be514b0fb41fbc70d249c8332b.png b/...termark./Doesn't_have_a_watermark!.29bec8d820bc50be514b0fb41fbc70d249c8332b.png
diff --git a/..._meme/you're_gonna_have_a_bad_time.c267526a598d75aa7816cc6690545ab7a12847c8.png b/..._meme/you're_gonna_have_a_bad_time.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...ges/sparta/_/this_is_a_wide_image!.c267526a598d75aa7816cc6690545ab7a12847c8.png b/...ges/sparta/_/this_is_a_wide_image!.c267526a598d75aa7816cc6690545ab7a12847c8.png
diff --git a/...ke_that/Me:_Stop_talking_like_that.abea544a8b7ea48002649923d478539f1cc5776b.png b/...ke_that/Me:_Stop_talking_like_that.abea544a8b7ea48002649923d478539f1cc5776b.png
diff --git a/..._of_sample_memes_is_too_damn_high!.363a8bdf63e34e7398a00dc7d2e6055b635c3f3f.png b/..._of_sample_memes_is_too_damn_high!.363a8bdf63e34e7398a00dc7d2e6055b635c3f3f.png
diff --git a/app/tests/test_models.py b/app/tests/test_models.py
@@ -14,25 +14,26 @@ def describe_template():
     def template():
         t = Template.objects.get("_test")
         t.clean()
-        return t
+        yield t
+        t.clean()
 
     def describe_str():
         def it_includes_the_path(expect, template):
             expect(str(template)).endswith("/memegen/templates/_test")
 
     def describe_valid():
-        @pytest.fixture(autouse=True)
-        def disable_hooks(monkeypatch):
+        def it_removes_invalid_styles(expect, template, monkeypatch):
             monkeypatch.setattr(datafiles.settings, "HOOKS_ENABLED", False)
-
-        def it_removes_invalid_styles(expect, template):
             template.styles = ["default", "sample", "unknown"]
             with (template.directory / "sample.jpg").open("w") as f:
                 f.write("")
             log.info(f"{template} valid: {template.valid}")
             expect(template.styles) == ["default", "sample"]
 
-        def it_only_includes_default_style_with_custom_overlay(expect, template):
+        def it_only_includes_default_style_with_custom_overlay(
+            expect, template, monkeypatch
+        ):
+            monkeypatch.setattr(datafiles.settings, "HOOKS_ENABLED", False)
             template.styles = []
             template.overlay = [Overlay()]
             log.info(f"{template} valid: {template.valid}")
@@ -43,6 +44,7 @@ def it_only_includes_default_style_with_custom_overlay(expect, template):
             expect(template.styles) == ["default"]
 
         def it_skips_cleanup_when_deployed(expect, template, monkeypatch):
+            monkeypatch.setattr(datafiles.settings, "HOOKS_ENABLED", False)
             monkeypatch.setattr(settings, "DEPLOYED", True)
             template.styles = ["anything"]
             log.info(f"{template} valid: {template.valid}")

diff --git a/app/types.py b/app/types.py
@@ -30,7 +30,7 @@ class Text:
     @classmethod
     def get_preview(cls) -> "Text":
         return cls(
-            color="#80808085",
+            color="#80808080",
             anchor_x=0.075,
             anchor_y=0.05,
             angle=10,

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,7 @@ pymdown-extensions = "^8.0"
 pygments = "^2.7.0"
 
 # Images
-pillow = "^8.1.2"
+pillow = "^8.2"
 spongemock = "~0.3.4"
 
 # Utilities

diff --git a/requirements.txt b/requirements.txt
@@ -25,7 +25,7 @@ minilog==2.0; python_version >= "3.6" and python_version < "4.0"
 multidict==5.1.0; python_version >= "3.6"
 orderedmultidict==1.0.1
 parse==1.19.0; python_version >= "3.7" and python_version < "4.0"
-pillow==8.1.2; python_version >= "3.6"
+pillow==8.2.0; python_version >= "3.6"
 pygments==2.8.1; python_version >= "3.5"
 pymdown-extensions==8.1.1; python_version >= "3.6"
 pyperclip==1.8.2