From 4ffb57c3d52dbdb976fe54b47a152992e283bd4b Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 6 Mar 2025 10:17:11 -0600 Subject: [PATCH] Reorganize includes per ruff's preferences --- examples/fbmirror.py | 3 ++- examples/fbmirror_scaled.py | 3 ++- examples/play_gif.py | 3 ++- examples/playframes.py | 3 ++- examples/quote_scroller.py | 3 ++- examples/rainbow_spiral.py | 3 ++- examples/simpletest.py | 3 ++- examples/simpletest_addre_bgr.py | 3 ++- examples/single_panel_simpletest.py | 3 ++- examples/virtualdisplay.py | 5 +++-- src/adafruit_blinka_raspberry_pi5_piomatter/click.py | 3 ++- 11 files changed, 23 insertions(+), 12 deletions(-) diff --git a/examples/fbmirror.py b/examples/fbmirror.py index ad4ddb5..1fa64ac 100644 --- a/examples/fbmirror.py +++ b/examples/fbmirror.py @@ -12,9 +12,10 @@ For help with commandline arguments, run `python fbmirror.py --help` """ -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import click import numpy as np + +import adafruit_blinka_raspberry_pi5_piomatter as piomatter import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click with open("/sys/class/graphics/fb0/virtual_size") as f: diff --git a/examples/fbmirror_scaled.py b/examples/fbmirror_scaled.py index 115f9a7..b104e60 100644 --- a/examples/fbmirror_scaled.py +++ b/examples/fbmirror_scaled.py @@ -37,10 +37,11 @@ or if `/boot/firmware/cmdline.txt` specifies a resolution such as `... video=HDMI-A-1:640x480M@60D`. """ -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import click import numpy as np import PIL.Image as Image + +import adafruit_blinka_raspberry_pi5_piomatter as piomatter import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click with open("/sys/class/graphics/fb0/virtual_size") as f: diff --git a/examples/play_gif.py b/examples/play_gif.py index 8a621ae..4f21131 100644 --- a/examples/play_gif.py +++ b/examples/play_gif.py @@ -11,10 +11,11 @@ The animated gif is played repeatedly until interrupted with ctrl-c. import time -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import PIL.Image as Image +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + width = 64 height = 32 diff --git a/examples/playframes.py b/examples/playframes.py index 9fa3bdf..373cf19 100644 --- a/examples/playframes.py +++ b/examples/playframes.py @@ -13,10 +13,11 @@ import glob import sys import time -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import PIL.Image as Image +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + images = sorted(glob.glob(sys.argv[1])) geometry = piomatter.Geometry(width=64, height=32, n_addr_lines=4, rotation=piomatter.Orientation.Normal) diff --git a/examples/quote_scroller.py b/examples/quote_scroller.py index 3d5639d..293386e 100644 --- a/examples/quote_scroller.py +++ b/examples/quote_scroller.py @@ -14,11 +14,12 @@ $ python quote_scroller.py """ -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import requests from PIL import Image, ImageDraw, ImageFont +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + # 128px for 2x1 matrices. Change to 64 if you're using a single matrix. total_width = 128 total_height = 32 diff --git a/examples/rainbow_spiral.py b/examples/rainbow_spiral.py index f4ed5e2..eb58436 100644 --- a/examples/rainbow_spiral.py +++ b/examples/rainbow_spiral.py @@ -10,11 +10,12 @@ Run like this: $ python rainbow_spiral.py """ -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import rainbowio from PIL import Image, ImageDraw +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + width = 64 height = 32 pen_radius = 1 diff --git a/examples/simpletest.py b/examples/simpletest.py index 64c048b..c36beb6 100644 --- a/examples/simpletest.py +++ b/examples/simpletest.py @@ -13,10 +13,11 @@ The image is displayed until the user hits enter to exit. import pathlib -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import PIL.Image as Image +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + geometry = piomatter.Geometry(width=64, height=64, n_addr_lines=4, rotation=piomatter.Orientation.Normal) framebuffer = np.asarray(Image.open(pathlib.Path(__file__).parent / "blinka64x64.png")) matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, diff --git a/examples/simpletest_addre_bgr.py b/examples/simpletest_addre_bgr.py index cf13d41..3425a68 100644 --- a/examples/simpletest_addre_bgr.py +++ b/examples/simpletest_addre_bgr.py @@ -13,10 +13,11 @@ The image is displayed until the user hits enter to exit. import pathlib -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np import PIL.Image as Image +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + geometry = piomatter.Geometry(width=64, height=64, n_addr_lines=5, rotation=piomatter.Orientation.Normal, n_planes=8) framebuffer = np.asarray(Image.open(pathlib.Path(__file__).parent / "blinka64x64.png")) matrix = piomatter.PioMatter(colorspace=piomatter.Colorspace.RGB888Packed, pinout=piomatter.Pinout.AdafruitMatrixBonnetBGR, framebuffer=framebuffer, geometry=geometry) diff --git a/examples/single_panel_simpletest.py b/examples/single_panel_simpletest.py index 6830dfd..3b20fcf 100644 --- a/examples/single_panel_simpletest.py +++ b/examples/single_panel_simpletest.py @@ -11,10 +11,11 @@ $ python simpletest.py """ -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import numpy as np from PIL import Image, ImageDraw +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + width = 64 height = 32 diff --git a/examples/virtualdisplay.py b/examples/virtualdisplay.py index 9f9c5d4..139444f 100644 --- a/examples/virtualdisplay.py +++ b/examples/virtualdisplay.py @@ -26,12 +26,13 @@ Here's an example for running an emulator using a rom stored in "/tmp/snesrom.sm import shlex from subprocess import Popen -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import click import numpy as np -import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click from pyvirtualdisplay.smartdisplay import SmartDisplay +import adafruit_blinka_raspberry_pi5_piomatter as piomatter +import adafruit_blinka_raspberry_pi5_piomatter.click as piomatter_click + @click.command @click.option("--scale", type=float, help="The scale factor, larger numbers mean more virtual pixels", default=1) diff --git a/src/adafruit_blinka_raspberry_pi5_piomatter/click.py b/src/adafruit_blinka_raspberry_pi5_piomatter/click.py index 197b6d3..7d13d03 100644 --- a/src/adafruit_blinka_raspberry_pi5_piomatter/click.py +++ b/src/adafruit_blinka_raspberry_pi5_piomatter/click.py @@ -5,9 +5,10 @@ from collections.abc import Callable from typing import Any -import adafruit_blinka_raspberry_pi5_piomatter as piomatter import click +import adafruit_blinka_raspberry_pi5_piomatter as piomatter + class PybindEnumChoice(click.Choice): def __init__(self, enum, case_sensitive=False):