merge main, resolve conflicts

Author: FoamyGuy

adafruit_button/button.py

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

adafruit_button/button_base.py

@@ -32,7 +32,6 @@
     pass
 
 
-
 def _check_color(color: Optional[Union[int, tuple[int, int, int]]]) -> int:
     # if a tuple is supplied, convert it to a RGB number
     if isinstance(color, tuple):

adafruit_button/sprite_button.py

@@ -26,7 +26,7 @@
 from adafruit_button.button_base import ButtonBase
 
 try:
-    from typing import Optional, Union, Tuple, List
+    from typing import Optional, Union, Tuple
     from fontio import FontProtocol
 except ImportError:
     pass