From 3be987da8dc6b929a0f2b58dbac2d784552a1c39 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Tue, 19 Mar 2024 12:13:03 -0700 Subject: [PATCH] Fix import order so pylint is happy --- busdisplay/__init__.py | 7 ++++--- busdisplay/_displaybus.py | 4 +++- displayio/__init__.py | 6 +++--- displayio/_displaycore.py | 4 ++-- epaperdisplay/__init__.py | 7 ++++--- i2cdisplaybus/__init__.py | 2 +- setup.py | 9 ++++++++- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/busdisplay/__init__.py b/busdisplay/__init__.py index 619b9fe..b21c4c8 100644 --- a/busdisplay/__init__.py +++ b/busdisplay/__init__.py @@ -23,7 +23,6 @@ import digitalio import microcontroller from circuitpython_typing import WriteableBuffer, ReadableBuffer from displayio._displaycore import _DisplayCore -from ._displaybus import _DisplayBus from displayio._colorconverter import ColorConverter from displayio._group import Group, circuitpython_splash from displayio._area import Area @@ -37,6 +36,7 @@ from displayio._constants import ( NO_COMMAND, DELAY, ) +from ._displaybus import _DisplayBus __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" @@ -225,7 +225,7 @@ class BusDisplay: self.auto_refresh = auto_refresh def __new__(cls, *args, **kwargs): - from ..displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import + from displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import allocate_display, ) @@ -242,7 +242,8 @@ class BusDisplay: ) self._core.send(DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, pixels) - def show(self, _group: Group) -> None: # pylint: disable=missing-function-docstring + @staticmethod + def show(_group: Group) -> None: # pylint: disable=missing-function-docstring raise AttributeError(".show(x) removed. Use .root_group = x") def _set_root_group(self, root_group: Group) -> None: diff --git a/busdisplay/_displaybus.py b/busdisplay/_displaybus.py index 0dd7edc..92d713e 100644 --- a/busdisplay/_displaybus.py +++ b/busdisplay/_displaybus.py @@ -25,4 +25,6 @@ import i2cdisplaybus __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" -_DisplayBus = Union[fourwire.FourWire, i2cdisplaybus.I2CDisplayBus, paralleldisplaybus.ParallelBus] +_DisplayBus = Union[ + fourwire.FourWire, i2cdisplaybus.I2CDisplayBus, paralleldisplaybus.ParallelBus +] diff --git a/displayio/__init__.py b/displayio/__init__.py index 87583f4..21cbadc 100644 --- a/displayio/__init__.py +++ b/displayio/__init__.py @@ -18,16 +18,16 @@ displayio for Blinka """ import threading from typing import Union +from busdisplay import BusDisplay +from busdisplay._displaybus import _DisplayBus +from epaperdisplay import EPaperDisplay from ._bitmap import Bitmap from ._colorspace import Colorspace from ._colorconverter import ColorConverter -from busdisplay import BusDisplay -from epaperdisplay import EPaperDisplay from ._group import Group from ._ondiskbitmap import OnDiskBitmap from ._palette import Palette from ._tilegrid import TileGrid -from busdisplay._displaybus import _DisplayBus from ._constants import CIRCUITPY_DISPLAY_LIMIT __version__ = "0.0.0+auto.0" diff --git a/displayio/_displaycore.py b/displayio/_displaycore.py index cead44e..286f903 100644 --- a/displayio/_displaycore.py +++ b/displayio/_displaycore.py @@ -27,11 +27,11 @@ import struct from circuitpython_typing import WriteableBuffer, ReadableBuffer from paralleldisplaybus import ParallelBus from fourwire import FourWire -from ._group import Group from i2cdisplaybus import I2CDisplayBus +from busdisplay._displaybus import _DisplayBus +from ._group import Group from ._structs import ColorspaceStruct, TransformStruct from ._area import Area -from busdisplay._displaybus import _DisplayBus from ._helpers import bswap16 from ._constants import ( CHIP_SELECT_UNTOUCHED, diff --git a/epaperdisplay/__init__.py b/epaperdisplay/__init__.py index 537e9e6..3bbbe11 100644 --- a/epaperdisplay/__init__.py +++ b/epaperdisplay/__init__.py @@ -22,10 +22,10 @@ from typing import Optional, Union import microcontroller from digitalio import DigitalInOut from circuitpython_typing import ReadableBuffer +from busdisplay._displaybus import _DisplayBus from displayio._displaycore import _DisplayCore from displayio._group import Group, circuitpython_splash from displayio._colorconverter import ColorConverter -from busdisplay._displaybus import _DisplayBus from displayio._area import Area from displayio._constants import ( CHIP_SELECT_TOGGLE_EVERY_BYTE, @@ -238,7 +238,7 @@ class EPaperDisplay: self._set_root_group(circuitpython_splash) def __new__(cls, *args, **kwargs): - from ..displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import + from displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import allocate_display, ) @@ -246,7 +246,8 @@ class EPaperDisplay: allocate_display(display_instance) return display_instance - def show(self, _group: Group) -> None: # pylint: disable=missing-function-docstring + @staticmethod + def show(_group: Group) -> None: # pylint: disable=missing-function-docstring raise AttributeError(".show(x) removed. Use .root_group = x") def _set_root_group(self, root_group: Group) -> None: diff --git a/i2cdisplaybus/__init__.py b/i2cdisplaybus/__init__.py index bcc8e4c..5527c6c 100644 --- a/i2cdisplaybus/__init__.py +++ b/i2cdisplaybus/__init__.py @@ -54,7 +54,7 @@ class I2CDisplayBus: self._dev_addr = device_address def __new__(cls, *args, **kwargs): - from ..displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import + from displayio import ( # pylint: disable=import-outside-toplevel, cyclic-import allocate_display_bus, ) diff --git a/setup.py b/setup.py index 011af4c..acea0c9 100644 --- a/setup.py +++ b/setup.py @@ -57,5 +57,12 @@ setup( # You can just specify the packages manually here if your project is # simple. Or you can use find_packages(). py_modules=["fontio", "terminalio"], - packages=["displayio", "vectorio", "paralleldisplaybus", "i2cdisplaybus", "fourwire", "busdisplay"], + packages=[ + "displayio", + "vectorio", + "paralleldisplaybus", + "i2cdisplaybus", + "fourwire", + "busdisplay", + ], ) -- 2.49.0