Fixed some type hint issues and updated requirements

Author: davecom

.github/workflows/python-package.yml

@@ -40,4 +40,4 @@ jobs:
       run: |
         python -m unittest discover -s tests
     - name: Check Type Hints with Pyright
-      uses: jakebailey/pyright-action@v2.3.1
+      uses: jakebailey/pyright-action@v2

Impressionist/impressionist.py

@@ -143,7 +143,7 @@ def create_output(self, out_file: str, height: int, vector: bool, animation_leng
         output_size = (int(original_width * ratio), int(original_height * ratio))
         output_image = Image.new("RGB", output_size, average_color)
         output_draw = ImageDraw.Draw(output_image)
-        svg = SVG(*output_size, average_color) if vector else None
+        svg = SVG(*output_size, average_color) if vector else None  # type: ignore
         animation_frames = [] if animation_length > 0 else None
         for coordinate_list, color in self.shapes:
             coordinates = [int(x * ratio) for x in coordinate_list]

Impressionist/svg.py

@@ -23,8 +23,8 @@ def __init__(self, width: int, height: int, background_color: tuple[int, int, in
 
     def draw_ellipse(self, x1: int, y1: int, x2: int, y2: int, color: tuple[int, int, int]):
         self.content += f'<ellipse cx="{(x1 + x2) // 2}" cy="{(y1 + y2) // 2}" ' \
-                        (f'rx="{abs(x1 - x2) // 2}" ry="{abs(y1 - y2) // 2}'
-                         f'" fill="rgb{color}" />\n')
+                        f'rx="{abs(x1 - x2) // 2}" ry="{abs(y1 - y2) // 2}" ' \
+                        f'fill="rgb{color}" />\n'
 
     def draw_line(self, x1: int, y1: int, x2: int, y2: int, color: tuple[int, int, int]):
         self.content += f'<line x1="{x1}" y1="{y1}" x2="{x2}" y2="{y2}" stroke="rgb{color}" ' \

RetroDither/dither.py

@@ -42,19 +42,20 @@ def diffuse(c: int, r: int, error: int, pattern: list[PatternPart]):
             row = r + part.dr
             if col < 0 or col >= image.width or row >= image.height:
                 continue
+            current_pixel: float = image.getpixel((col, row))  # type: ignore
             # Add *error_part* to the pixel at (*col*, *row*) in *image*
             error_part = (error * part.numerator) // part.denominator
-            image.putpixel((col, row), image.getpixel((col, row)) + error_part)
+            image.putpixel((col, row), current_pixel + error_part)
 
     result = array('B', [0] * (image.width * image.height))
     for y in range(image.height):
         for x in range(image.width):
-            old_pixel = image.getpixel((x, y))
+            old_pixel: float = image.getpixel((x, y))  # type: ignore
             # Every new pixel is either solid white or solid black
             # since this is all that the original Macintosh supported
             new_pixel = 255 if old_pixel > THRESHOLD else 0
             result[y * image.width + x] = new_pixel
-            difference = (old_pixel - new_pixel)
+            difference = int(old_pixel - new_pixel)
             # Disperse error amongst nearby upcoming pixels
             diffuse(x, y, difference, ATKINSON)
 

requirements.txt

@@ -1,3 +1,3 @@
-Pillow~=10.3.0
-pygame~=2.5.2
-numpy~=1.26.4
+Pillow~=11.0.0
+pygame~=2.6.1
+numpy~=2.1.3