python: Upgrade Pillow to 10.3.0
Bug: 302284275
Change-Id: I9a62d4f7bdf1928423e00b962cdc3337259deb42
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/212012
Pigweed-Auto-Submit: Anthony DiGirolamo <tonymd@google.com>
Reviewed-by: Carlos Chinchilla <cachinchilla@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
diff --git a/.gn b/.gn
index f20251b..f528034 100644
--- a/.gn
+++ b/.gn
@@ -25,9 +25,6 @@
pw_build_PIP_CONSTRAINTS = [
# Pigweed upstream constraints
"$dir_pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list",
-
- # Experimental specific constraints
- "//tools/constraint.list",
]
pw_build_PIP_REQUIREMENTS = [
diff --git a/pw_graphics/py/pw_graphics/png2cc.py b/pw_graphics/py/pw_graphics/png2cc.py
index d4e1a0a..4201dbf 100755
--- a/pw_graphics/py/pw_graphics/png2cc.py
+++ b/pw_graphics/py/pw_graphics/png2cc.py
@@ -20,7 +20,7 @@
import math
from pathlib import Path
-from PIL import Image # type: ignore
+from PIL import Image
from jinja2 import Environment, DictLoader, make_logging_undefined
jinja_templates = {
@@ -75,7 +75,7 @@
def render_rgb565_header(
- alpha_composite: Image,
+ alpha_composite: Image.Image,
tile_width: int,
tile_height: int,
sprite_width: int,
@@ -102,7 +102,7 @@
def render_font_header(
- alpha_composite: Image,
+ alpha_composite: Image.Image,
tile_width: int,
tile_height: int,
sprite_width: int,
diff --git a/tools/constraint.list b/tools/constraint.list
deleted file mode 100644
index f8018c0..0000000
--- a/tools/constraint.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# //applications/tls_example/trust_store/py
-pyOpenSSL==22.0.0
-# //pw_graphics/py
-Pillow==9.4.0
diff --git a/tools/requirements.txt b/tools/requirements.txt
index f99133c..ed769d5 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -15,4 +15,5 @@
# //applications/tls_example/trust_store/py
pyOpenSSL==22.0.0
# //pw_graphics/py
-Pillow==9.4.0
+Pillow==10.3.0
+types-Pillow==10.2.0.20240520
