Merge branch 'dev' into users/t-xunguy/debug-filter

src/base_circuitpython/displayio/group.py

@@ -3,7 +3,7 @@
 from PIL import Image
 import adafruit_display_text
 
-from .tile_grid import TileGrid
+from displayio.tile_grid import TileGrid
 from . import constants as CONSTANTS
 
 import common

src/base_circuitpython/displayio/test/test_group.py

@@ -7,10 +7,10 @@
 
 from common import utils
 
-from ..tile_grid import TileGrid
-from ..group import Group
-from ..palette import Palette
-from ..bitmap import Bitmap
+from displayio.tile_grid import TileGrid
+from displayio.group import Group
+from displayio.palette import Palette
+from displayio.bitmap import Bitmap
 from .. import constants as CONSTANTS
 from PIL import Image
 

src/debug_user_code.py

@@ -32,12 +32,12 @@
 # Insert absolute path to Circuitpython libraries for CLUE into sys.path
 sys.path.insert(0, os.path.join(abs_path_to_parent_dir, CONSTANTS.CIRCUITPYTHON))
 
-# get board so we can get terminal handle
-import board
-
 # This import must happen after the sys.path is modified
 from common import debugger_communication_client
 
+# get board so we can get terminal handle
+import board
+
 # get handle to terminal for clue
 curr_terminal = board.DISPLAY.terminal