adafruit-circuitpython-displayio-layout 2.2.0__tar.gz → 2.2.2__tar.gz

adafruit_circuitpython_displayio_layout-2.2.2/.gitattributes

@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+.py text eol=lf
+.rst text eol=lf
+.txt text eol=lf
+.yaml text eol=lf
+.toml text eol=lf
+.license text eol=lf
+.md text eol=lf

adafruit_circuitpython_displayio_layout-2.2.2/.pre-commit-config.yaml

@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
+#
+# SPDX-License-Identifier: Unlicense
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.4
+    hooks:
+      - id: ruff-format
+      - id: ruff
+        args: ["--fix"]
+  - repo: https://github.com/fsfe/reuse-tool
+    rev: v3.0.1
+    hooks:
+      - id: reuse

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/.readthedocs.yaml

@@ -8,6 +8,9 @@
 # Required
 version: 2
 
+sphinx:
+  configuration: docs/conf.py
+
 build:
   os: ubuntu-20.04
   tools:

{adafruit_circuitpython_displayio_layout-2.2.0/adafruit_circuitpython_displayio_layout.egg-info → adafruit_circuitpython_displayio_layout-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.2.0
+Version: 2.2.2
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -37,9 +37,9 @@ Introduction
     :target: https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout/actions
     :alt: Build Status
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code Style: Black
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Code Style: Ruff
 
 CircuitPython helper library for displayio layouts and widgets.
 

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/README.rst

@@ -13,9 +13,9 @@ Introduction
     :target: https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout/actions
     :alt: Build Status
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code Style: Black
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Code Style: Ruff
 
 CircuitPython helper library for displayio layouts and widgets.
 

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2/adafruit_circuitpython_displayio_layout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: adafruit-circuitpython-displayio-layout
-Version: 2.2.0
+Version: 2.2.2
 Summary: CircuitPython helper library for displayio layouts and widgets.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT
@@ -37,9 +37,9 @@ Introduction
     :target: https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout/actions
     :alt: Build Status
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code Style: Black
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Code Style: Ruff
 
 CircuitPython helper library for displayio layouts and widgets.
 

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_circuitpython_displayio_layout.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
+.gitattributes
 .gitignore
 .pre-commit-config.yaml
-.pylintrc
 .readthedocs.yaml
 CODE_OF_CONDUCT.md
 LICENSE
@@ -9,6 +9,7 @@ README.rst.license
 optional_requirements.txt
 pyproject.toml
 requirements.txt
+ruff.toml
 .github/PULL_REQUEST_TEMPLATE/adafruit_circuitpython_pr.md
 .github/workflows/build.yml
 .github/workflows/failure-help-text.yml

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/layouts/grid_layout.py

@@ -22,6 +22,7 @@ Implementation Notes
   https://github.com/adafruit/circuitpython/releases
 
 """
+
 try:
     # Used only for typing
     from typing import Any, List, Optional, Tuple, Union
@@ -29,10 +30,11 @@ except ImportError:
     pass
 
 import math
+
 import displayio
 from vectorio import Rectangle
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -58,8 +60,6 @@ class GridLayout(displayio.Group):
 
     """
 
-    # pylint: disable=too-many-arguments
-    # pylint: disable=too-many-instance-attributes
     def __init__(
         self,
         x: int,
@@ -106,9 +106,7 @@ class GridLayout(displayio.Group):
                     self.v_divider_line_cols.append(_x)
 
         # use at least 1 padding so that content is inside the divider lines
-        if cell_padding == 0 and (
-            divider_lines or h_divider_line_rows or v_divider_line_cols
-        ):
+        if cell_padding == 0 and (divider_lines or h_divider_line_rows or v_divider_line_cols):
             self.cell_padding = 1
 
     def layout_cells(self):
@@ -116,7 +114,6 @@ class GridLayout(displayio.Group):
         self._layout_cells()
 
     def _layout_cells(self) -> None:
-        # pylint: disable=too-many-locals, too-many-branches, too-many-statements
         for line_obj in self._divider_lines:
             self.remove(line_obj["rect"])
         for cell in self._cell_content_list:
@@ -310,11 +307,8 @@ class GridLayout(displayio.Group):
                     areas larger than 1x1 cells. For 1x1 cells this will equal zero
                     and not change anything.
                     """
-                    if (
-                        grid_position_y + content_cell_size_y - 1
-                    ) == grid_size_y - 1 and (
-                        (grid_position_y + content_cell_size_y - 1) + 1
-                        in self.h_divider_line_rows
+                    if (grid_position_y + content_cell_size_y - 1) == grid_size_y - 1 and (
+                        (grid_position_y + content_cell_size_y - 1) + 1 in self.h_divider_line_rows
                     ):
                         self._divider_lines.append(
                             {
@@ -350,11 +344,8 @@ class GridLayout(displayio.Group):
                     areas larger than 1x1 cells. For 1x1 cells this will equal zero
                     and not change anything.
                     """
-                    if (
-                        grid_position_x + content_cell_size_x - 1
-                    ) == grid_size_x - 1 and (
-                        (grid_position_x + content_cell_size_x - 1) + 1
-                        in self.v_divider_line_cols
+                    if (grid_position_x + content_cell_size_x - 1) == grid_size_x - 1 and (
+                        (grid_position_x + content_cell_size_x - 1) + 1 in self.v_divider_line_cols
                     ):
                         self._divider_lines.append(
                             {
@@ -426,11 +417,7 @@ class GridLayout(displayio.Group):
             ):
                 return self._cell_content_list[index]["content"]
 
-        raise KeyError(
-            "GridLayout does not contain cell at coordinates {}".format(
-                cell_coordinates
-            )
-        )
+        raise KeyError(f"GridLayout does not contain cell at coordinates {cell_coordinates}")
 
     @property
     def cell_size_pixels(self) -> Tuple[int, int]:

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/layouts/linear_layout.py

@@ -54,7 +54,7 @@ class LinearLayout(Widget):
         self.x = x
         self.y = y
         self.padding = padding
-        if orientation not in [self.VERTICAL_ORIENTATION, self.HORIZONTAL_ORIENTATION]:
+        if orientation not in {self.VERTICAL_ORIENTATION, self.HORIZONTAL_ORIENTATION}:
             raise ValueError(
                 "Orientation must be either LinearLayout.VERTICAL_ORIENTATION"
                 " or LinearLayout.HORIZONTAL_ORIENTATION"
@@ -77,7 +77,6 @@ class LinearLayout(Widget):
         self._layout()
 
     def _layout(self):
-        # pylint: disable=too-many-branches, protected-access
         self._prev_content_end = 0
 
         for _, content in enumerate(self._content_list):
@@ -100,14 +99,10 @@ class LinearLayout(Widget):
                 else:
                     content.x = self._prev_content_end
                     if not hasattr(content, "tile_width"):
-                        self._prev_content_end = (
-                            content.x + content.width + (self.padding * 2)
-                        )
+                        self._prev_content_end = content.x + content.width + (self.padding * 2)
                     else:
                         self._prev_content_end = (
-                            content.x
-                            + (content.width * content.tile_width)
-                            + (self.padding * 2)
+                            content.x + (content.width * content.tile_width) + (self.padding * 2)
                         )
             else:  # use anchor point
                 content.anchor_point = (
@@ -130,9 +125,7 @@ class LinearLayout(Widget):
 
                 else:
                     original_achored_pos_y = (
-                        content.anchored_position[1]
-                        if content.anchored_position is not None
-                        else 0
+                        content.anchored_position[1] if content.anchored_position is not None else 0
                     )
 
                     content.anchored_position = (

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/layouts/page_layout.py

@@ -22,9 +22,9 @@ Implementation Notes
   https://github.com/adafruit/circuitpython/releases
 
 """
+
 try:
     # Used only for typing
-    # pylint: disable=unused-import
     from typing import Tuple
 
 except ImportError:
@@ -32,7 +32,7 @@ except ImportError:
 
 import displayio
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -90,16 +90,12 @@ class PageLayout(displayio.Group):
             raise AttributeError("Must pass either page_name or page_index")
 
         if page_index is not None and page_name is not None:
-            raise AttributeError(
-                "Must pass either page_name or page_index only one or the other"
-            )
+            raise AttributeError("Must pass either page_name or page_index only one or the other")
 
         if page_index is not None:
             if page_index >= len(self.page_content_list):
                 raise KeyError(
-                    "KeyError at index {} in list length {}".format(
-                        page_index, len(self.page_content_list)
-                    ),
+                    f"KeyError at index {page_index} in list length {len(self.page_content_list)}",
                 )
 
         if page_name is not None:
@@ -110,7 +106,7 @@ class PageLayout(displayio.Group):
                         _found = True
 
             if not _found:
-                raise KeyError("Page with name {} not found".format(page_name))
+                raise KeyError(f"Page with name {page_name} not found")
 
     def get_page(self, page_name=None, page_index=None):
         """
@@ -133,9 +129,7 @@ class PageLayout(displayio.Group):
                     return cell
 
         raise KeyError(
-            "PageLayout does not contain page: {}".format(
-                page_index if page_index else page_name
-            )
+            f"PageLayout does not contain page: {page_index if page_index else page_name}"
         )
 
     def show_page(self, page_name=None, page_index=None):
@@ -205,11 +199,10 @@ class PageLayout(displayio.Group):
 
         if self._cur_showing_index + 1 < len(self.page_content_list):
             self.show_page(page_index=self._cur_showing_index + 1)
+        elif not loop:
+            print("No more pages")
         else:
-            if not loop:
-                print("No more pages")
-            else:
-                self.show_page(page_index=0)
+            self.show_page(page_index=0)
 
     def previous_page(self, loop=True):
         """
@@ -219,8 +212,7 @@ class PageLayout(displayio.Group):
         """
         if self._cur_showing_index - 1 >= 0:
             self.show_page(page_index=self._cur_showing_index - 1)
+        elif not loop:
+            print("No more pages")
         else:
-            if not loop:
-                print("No more pages")
-            else:
-                self.show_page(page_index=len(self.page_content_list) - 1)
+            self.show_page(page_index=len(self.page_content_list) - 1)

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/layouts/tab_layout.py

@@ -22,22 +22,25 @@ Implementation Notes
   https://github.com/adafruit/circuitpython/releases
 
 """
+
 try:
-    from typing import Optional, Union, Tuple
-    from fontio import BuiltinFont
+    from typing import Optional, Tuple, Union
+
     from adafruit_bitmap_font.bdf import BDF
     from adafruit_bitmap_font.pcf import PCF
+    from fontio import BuiltinFont
 except ImportError:
     pass
 
-import terminalio
-import displayio
 import adafruit_imageload
+import displayio
+import terminalio
 from adafruit_display_text.bitmap_label import Label
 from adafruit_imageload.tilegrid_inflator import inflate_tilegrid
+
 from adafruit_displayio_layout.layouts.page_layout import PageLayout
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -68,8 +71,6 @@ class TabLayout(displayio.Group):
     :param int tab_count: How many tabs to draw in the layout. Positive whole numbers are valid.
     """
 
-    # pylint: disable=too-many-instance-attributes, too-many-arguments, invalid-name, too-many-branches
-
     def __init__(
         self,
         x: int = 0,
@@ -86,8 +87,7 @@ class TabLayout(displayio.Group):
         tab_count: int = None,
     ):
         if display is None:
-            # pylint: disable=import-outside-toplevel
-            import board
+            import board  # noqa: PLC0415, non-top-level-import
 
             if hasattr(board, "DISPLAY"):
                 display = board.DISPLAY
@@ -100,9 +100,7 @@ class TabLayout(displayio.Group):
 
         super().__init__(x=x, y=y)
         self.tab_count = tab_count
-        self._active_bmp, self._active_palette = adafruit_imageload.load(
-            showing_tab_spritesheet
-        )
+        self._active_bmp, self._active_palette = adafruit_imageload.load(showing_tab_spritesheet)
         self._inactive_bmp, self._inactive_palette = adafruit_imageload.load(
             inactive_tab_spritesheet
         )
@@ -121,9 +119,7 @@ class TabLayout(displayio.Group):
             for index in inactive_tab_transparent_indexes:
                 self._inactive_palette.make_transparent(index)
         else:
-            raise AttributeError(
-                "inactive_tab_transparent_indexes must be int or tuple"
-            )
+            raise AttributeError("inactive_tab_transparent_indexes must be int or tuple")
 
         self.tab_height = self._active_bmp.height
         self.display = display
@@ -147,8 +143,7 @@ class TabLayout(displayio.Group):
                     bmp_obj=self._inactive_bmp,
                     bmp_palette=self._inactive_palette,
                     target_size=(
-                        (self.display.width // self.tab_count)
-                        // (self._active_bmp.width // 3),
+                        (self.display.width // self.tab_count) // (self._active_bmp.width // 3),
                         3,
                     ),
                 )
@@ -165,8 +160,7 @@ class TabLayout(displayio.Group):
 
                 _tab_label.anchor_point = (0.5, 0.5)
                 _tab_label.anchored_position = (
-                    _tab_tilegrid.x
-                    + ((_tab_tilegrid.width * _tab_tilegrid.tile_width) // 2),
+                    _tab_tilegrid.x + ((_tab_tilegrid.width * _tab_tilegrid.tile_width) // 2),
                     (_tab_tilegrid.height * _tab_tilegrid.tile_height) // 2,
                 )
                 _new_tab_group.append(_tab_label)
@@ -282,8 +276,6 @@ class TabLayout(displayio.Group):
 
         if touch_event:
             if 0 <= touch_event[1] <= self.tab_height:
-                touched_tab_index = touch_event[0] // (
-                    self.display.width // self.tab_count
-                )
+                touched_tab_index = touch_event[0] // (self.display.width // self.tab_count)
                 print(f"{touch_event[0]} - {touched_tab_index}")
                 self.showing_page_index = touched_tab_index

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/widgets/cartesian.py

@@ -21,13 +21,11 @@ Implementation Notes
 
 """
 
-# pylint: disable=too-many-lines, too-many-instance-attributes, too-many-arguments
-# pylint: disable=too-many-locals, too-many-statements
-
 import displayio
 import terminalio
-from adafruit_display_text import bitmap_label
 import vectorio
+from adafruit_display_text import bitmap_label
+
 from adafruit_displayio_layout.widgets.widget import Widget
 
 try:
@@ -41,7 +39,7 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -229,28 +227,20 @@ class Cartesian(Widget):
         self._valuey = self.height / 100
         self._factory = 100 / (self._yrange[1] - self._yrange[0])
 
-        self._tick_bitmap = displayio.Bitmap(
-            self._tick_line_thickness, self._tick_line_height, 3
-        )
+        self._tick_bitmap = displayio.Bitmap(self._tick_line_thickness, self._tick_line_height, 3)
         self._tick_bitmap.fill(1)
 
         self._subticks = subticks
 
         axesx_height = (
-            2
-            + self._axes_line_thickness
-            + self._font_height
-            + self._tick_line_height // 2
+            2 + self._axes_line_thickness + self._font_height + self._tick_line_height // 2
         )
 
         self._axesx_bitmap = displayio.Bitmap(self.width, axesx_height, 4)
         self._axesx_bitmap.fill(0)
 
         self._axesy_width = (
-            2
-            + self._axes_line_thickness
-            + self._font_width
-            + self._tick_line_height // 2
+            2 + self._axes_line_thickness + self._font_width + self._tick_line_height // 2
         )
 
         self._axesy_bitmap = displayio.Bitmap(self._axesy_width, self.height, 4)
@@ -408,20 +398,14 @@ class Cartesian(Widget):
                     self._font,
                     color=self._font_color,
                     text=text_tick,
-                    x=-shift_label_x
-                    - self._axes_line_thickness
-                    - self._tick_line_height
-                    - 2,
+                    x=-shift_label_x - self._axes_line_thickness - self._tick_line_height - 2,
                     y=0 + self.height - text_dist,
                 )
                 self.append(tick_text)
 
                 bitmaptools.fill_region(
                     self._axesy_bitmap,
-                    self._axesy_width
-                    - self._axes_line_thickness
-                    - self._tick_line_height
-                    - 1,
+                    self._axesy_width - self._axes_line_thickness - self._tick_line_height - 1,
                     text_dist,
                     self._axesy_width - self._axes_line_thickness - 1,
                     text_dist + self._tick_line_thickness,
@@ -453,9 +437,7 @@ class Cartesian(Widget):
         self.append(self._pointer)
 
     def _calc_local_xy(self, x: int, y: int) -> Tuple[int, int]:
-        local_x = (
-            int((x - self._xrange[0]) * self._factorx * self._valuex) + self._nudge_x
-        )
+        local_x = int((x - self._xrange[0]) * self._factorx * self._valuex) + self._nudge_x
         # details on `+ (self.height - 1)` :
         # the bitmap is set to self.width & self.height
         # but we are only allowed to draw to pixels 0..height-1 and 0..width-1
@@ -473,9 +455,7 @@ class Cartesian(Widget):
         return 0 <= local_y < self.height
 
     def _check_local_xy_in_range(self, local_x: int, local_y: int) -> bool:
-        return self._check_local_x_in_range(local_x) and self._check_local_y_in_range(
-            local_y
-        )
+        return self._check_local_x_in_range(local_x) and self._check_local_y_in_range(local_y)
 
     def _check_x_in_range(self, x: int) -> bool:
         return self._xrange[0] <= x <= self._xrange[1]
@@ -498,30 +478,15 @@ class Cartesian(Widget):
         if self._verbose:
             print("")
             print(
-                "xy:      ({: >4}, {: >4})  "
-                "_xrange: ({: >4}, {: >4})  "
-                "_yrange: ({: >4}, {: >4})  "
-                "".format(
-                    x,
-                    y,
-                    self._xrange[0],
-                    self._xrange[1],
-                    self._yrange[0],
-                    self._yrange[1],
-                )
+                f"xy:      ({x: >4}, {y: >4})  "
+                + f"_xrange: ({self._xrange[0]: >4}, {self._xrange[1]: >4})  "
+                + f"_yrange: ({self._yrange[0]: >4}, {self._yrange[1]: >4})  "
+                ""
             )
             print(
-                "local_*: ({: >4}, {: >4})  "
-                " width:  ({: >4}, {: >4})  "
-                " height: ({: >4}, {: >4})  "
-                "".format(
-                    local_x,
-                    local_y,
-                    0,
-                    self.width,
-                    0,
-                    self.height,
-                )
+                f"local_*: ({local_x: >4}, {local_y: >4})  "
+                + f" width:  ({0: >4}, {self.width: >4})  "
+                + f" height: ({0: >4}, {self.height: >4})  "
             )
         if self._check_xy_in_range(x, y):
             if self._check_local_xy_in_range(local_x, local_y):
@@ -536,44 +501,28 @@ class Cartesian(Widget):
                 if not self._check_local_x_in_range(local_x):
                     raise ValueError(
                         "local_x out of range: "
-                        "local_x:{: >4}; _xrange({: >4}, {: >4})"
-                        "".format(
-                            local_x,
-                            0,
-                            self.width,
-                        )
+                        f"local_x:{local_x: >4}; _xrange({0: >4}, {self.width: >4})"
+                        ""
                     )
                 if not self._check_local_y_in_range(local_y):
                     raise ValueError(
                         "local_y out of range: "
-                        "local_y:{: >4}; _yrange({: >4}, {: >4})"
-                        "".format(
-                            local_y,
-                            0,
-                            self.height,
-                        )
+                        f"local_y:{local_y: >4}; _yrange({0: >4}, {self.height: >4})"
+                        ""
                     )
         else:
             # for better error messages we check in detail what failed...
             if not self._check_x_in_range(x):
                 raise ValueError(
                     "x out of range:    "
-                    "x:{: >4}; xrange({: >4}, {: >4})"
-                    "".format(
-                        x,
-                        self._xrange[0],
-                        self._xrange[1],
-                    )
+                    f"x:{x: >4}; xrange({self._xrange[0]: >4}, {self._xrange[1]: >4})"
+                    ""
                 )
             if not self._check_y_in_range(y):
                 raise ValueError(
                     "y out of range:    "
-                    "y:{: >4}; yrange({: >4}, {: >4})"
-                    "".format(
-                        y,
-                        self._yrange[0],
-                        self._yrange[1],
-                    )
+                    f"y:{y: >4}; yrange({self._yrange[0]: >4}, {self._yrange[1]: >4})"
+                    ""
                 )
 
     def update_pointer(self, x: int, y: int) -> None:

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/widgets/control.py

@@ -27,11 +27,9 @@ except ImportError:
     pass
 
 
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
-# pylint: disable=unsubscriptable-object, unnecessary-pass
-
 
 class Control:
     """A Control class for responsive elements, including touch response functions for displays.

{adafruit_circuitpython_displayio_layout-2.2.0 → adafruit_circuitpython_displayio_layout-2.2.2}/adafruit_displayio_layout/widgets/easing.py

@@ -75,8 +75,7 @@ Implementation Notes
 
 import math
 
-
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout.git"
 
 
@@ -285,7 +284,7 @@ def exponential_easeinout(pos: float) -> float:
     """
     Easing function for animations: Exponential Ease In & Out
     """
-    if pos in (0.0, 1.0):
+    if pos in {0.0, 1.0}:
         return pos
     if pos < 0.5:
         return 0.5 * math.pow(2, (20 * pos) - 10)
@@ -318,8 +317,7 @@ def elastic_easeinout(pos: float) -> float:
     if pos < 0.5:
         return 0.5 * math.sin(13 * math.pi * pos) * math.pow(2, 10 * ((2 * pos) - 1))
     return 0.5 * (
-        math.sin(-13 * math.pi / 2 * ((2 * pos - 1) + 1)) * pow(2, -10 * (2 * pos - 1))
-        + 2
+        math.sin(-13 * math.pi / 2 * ((2 * pos - 1) + 1)) * pow(2, -10 * (2 * pos - 1)) + 2
     )