merge main, resolve conflicts

Author: FoamyGuy

adafruit_button/button.py

@@ -29,7 +29,8 @@
 from adafruit_button.button_base import ButtonBase, _check_color
 
 try:
-    from typing import Optional, Union, Tuple
+    from typing import Optional, Tuple, Union
+
     from displayio import Group
     from fontio import FontProtocol
 except ImportError:

adafruit_button/button_base.py

@@ -22,12 +22,13 @@
 
 """
 
+import terminalio
 from adafruit_display_text.bitmap_label import Label
 from displayio import Group
-import terminalio
 
 try:
-    from typing import Optional, Union, Tuple
+    from typing import Optional, Tuple, Union
+
     from fontio import FontProtocol
 except ImportError:
     pass

adafruit_button/sprite_button.py

@@ -74,7 +74,7 @@ def __init__(  # noqa: PLR0913 Too many arguments
         bmp_path: str = None,
         selected_bmp_path: Optional[str] = None,
         transparent_index: Optional[Union[int, Tuple]] = None,
-        label_scale: Optional[int] = 1
+        label_scale: Optional[int] = 1,
     ):
         if bmp_path is None:
             raise ValueError("Please supply bmp_path. It cannot be None.")