From 9972ea726839c69e204fb813cbaf441c8808b588 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 29 Jul 2024 16:43:54 -0500 Subject: [PATCH] use ruff instead of pylint/black --- .gitattributes | 5 + .pre-commit-config.yaml | 42 +- .pylintrc | 399 ------------------ README.rst | 6 +- adafruit_is31fl3731/__init__.py | 38 +- adafruit_is31fl3731/keybow2040.py | 10 +- adafruit_is31fl3731/led_shim.py | 11 +- adafruit_is31fl3731/matrix.py | 6 +- adafruit_is31fl3731/rgbmatrix5x5.py | 5 +- docs/conf.py | 8 +- examples/is31fl3731_16x9_charlieplexed_pwm.py | 14 +- examples/is31fl3731_frame_example.py | 1 + examples/is31fl3731_keybow_2040_rainbow.py | 15 +- examples/is31fl3731_ledshim_fade.py | 2 + examples/is31fl3731_ledshim_rainbow.py | 2 + examples/is31fl3731_pillow_animated_gif.py | 1 + examples/is31fl3731_pillow_marquee.py | 4 +- examples/is31fl3731_rgbmatrix5x5_rainbow.py | 17 +- examples/is31fl3731_text_example.py | 6 +- ruff.toml | 99 +++++ 20 files changed, 175 insertions(+), 516 deletions(-) create mode 100644 .gitattributes delete mode 100644 .pylintrc create mode 100644 ruff.toml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..27240db --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Justin Myers +# +# SPDX-License-Identifier: Unlicense + +* text eol=lf diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70ade69..f27b786 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,42 +1,22 @@ # SPDX-FileCopyrightText: 2020 Diego Elio Pettenò +# SPDX-FileCopyrightText: 2024 Justin Myers # # SPDX-License-Identifier: Unlicense repos: - - repo: https://github.com/python/black - rev: 23.3.0 - hooks: - - id: black - - repo: https://github.com/fsfe/reuse-tool - rev: v1.1.2 - hooks: - - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - - repo: https://github.com/pycqa/pylint - rev: v2.17.4 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.3.4 hooks: - - id: pylint - name: pylint (library code) - types: [python] - args: - - --disable=consider-using-f-string - exclude: "^(docs/|examples/|tests/|setup.py$)" - - id: pylint - name: pylint (example code) - description: Run pylint rules on "examples/*.py" files - types: [python] - files: "^examples/" - args: - - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code - - id: pylint - name: pylint (test code) - description: Run pylint rules on "tests/*.py" files - types: [python] - files: "^tests/" - args: - - --disable=missing-docstring,consider-using-f-string,duplicate-code + - id: ruff-format + - id: ruff + args: ["--fix"] + - repo: https://github.com/fsfe/reuse-tool + rev: v3.0.1 + hooks: + - id: reuse diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index f945e92..0000000 --- a/.pylintrc +++ /dev/null @@ -1,399 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries -# -# SPDX-License-Identifier: Unlicense - -[MASTER] - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code -extension-pkg-whitelist= - -# Add files or directories to the ignore-list. They should be base names, not -# paths. -ignore=CVS - -# Add files or directories matching the regex patterns to the ignore-list. The -# regex matches against base names, not paths. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. -jobs=1 - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins=pylint.extensions.no_self_use - -# Pickle collected data for later comparisons. -persistent=yes - -# Specify a configuration file. -#rcfile= - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -# disable=import-error,raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,deprecated-str-translate-call -disable=raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,import-error,pointless-string-statement,unspecified-encoding - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -enable= - - -[REPORTS] - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - -# Set the output format. Available formats are text, parseable, colorized, json -# and msvs (visual studio).You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Tells whether to display a full report or only the messages -reports=no - -# Activate the evaluation score. -score=yes - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -# notes=FIXME,XXX,TODO -notes=FIXME,XXX - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# This flag controls whether pylint should warn about no-member and similar -# checks whenever an opaque object is returned when inferring. The inference -# can return multiple potential results while evaluating a Python object, but -# some branches might not be evaluated, which results in partial inference. In -# that case, it might be useful to still emit no-member and other checks for -# the rest of the inferred objects. -ignore-on-opaque-inference=yes - -# List of class names for which member attributes should not be checked (useful -# for classes with dynamically set attributes). This supports the use of -# qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis. It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules=board - -# Show a hint with possible names when a member name was not found. The aspect -# of finding the hint is based on edit distance. -missing-member-hint=yes - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - - -[VARIABLES] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# Tells whether unused global variables should be treated as a violation. -allow-global-unused-variables=yes - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.*|^ignored_|^unused_ - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,future.builtins - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -# expected-line-ending-format= -expected-line-ending-format=LF - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=100 - -# Maximum number of lines in a module -max-module-lines=1000 - -# Allow the body of a class to be on the same line as the declaration if body -# contains single statement. -single-line-class-stmt=no - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=yes - -# Minimum lines number of a similarity. -min-similarity-lines=12 - - -[BASIC] - -# Regular expression matching correct argument names -argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct attribute names -attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct class names -# class-rgx=[A-Z_][a-zA-Z0-9]+$ -class-rgx=[A-Z_][a-zA-Z0-9_]+$ - -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Regular expression matching correct function names -function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Good variable names which should always be accepted, separated by a comma -# good-names=i,j,k,ex,Run,_ -good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_ - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct method names -method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -property-classes=abc.abstractproperty - -# Regular expression matching correct variable names -variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - - -[IMPORTS] - -# Allow wildcard imports from modules that define __all__. -allow-wildcard-with-all=no - -# Analyse import fallback blocks. This can be used to support both Python 2 and -# 3 compatible code, which means that the block might have code that exists -# only in one or another interpreter, leading to false positives when analysed. -analyse-fallback-blocks=no - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=optparse,tkinter.tix - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - -# Force import order to recognize a module as part of the standard -# compatibility libraries. -known-standard-library= - -# Force import order to recognize a module as part of a third party library. -known-third-party=enchant - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Maximum number of attributes for a class (see R0902). -# max-attributes=7 -max-attributes=11 - -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 - -# Maximum number of branch for function / method body -max-branches=12 - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of statements in function / method body -max-statements=50 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=1 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=builtins.Exception diff --git a/README.rst b/README.rst index c507059..f3fb7fb 100644 --- a/README.rst +++ b/README.rst @@ -13,9 +13,9 @@ Introduction :target: https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731/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 driver for the IS31FL3731 charlieplex IC. diff --git a/adafruit_is31fl3731/__init__.py b/adafruit_is31fl3731/__init__.py index 23e7b97..e87b5d0 100644 --- a/adafruit_is31fl3731/__init__.py +++ b/adafruit_is31fl3731/__init__.py @@ -47,33 +47,36 @@ https://github.com/adafruit/circuitpython/releases """ + # imports import math import time -from micropython import const from adafruit_bus_device.i2c_device import I2CDevice +from micropython import const try: import typing - import busio - from circuitpython_typing import TypeAlias, Union - from circuitpython_typing import ( - WriteableBuffer, - ReadableBuffer, - ) # Import ReadableBuffer here + # Import ReadableBuffer here from typing import ( TYPE_CHECKING, + Iterable, List, - Tuple, Optional, - Iterable, + Tuple, ) + import busio + from circuitpython_typing import ( + ReadableBuffer, + TypeAlias, + Union, + WriteableBuffer, + ) from PIL import Image -except ImportError as e: +except ImportError: pass @@ -319,7 +322,6 @@ def audio_play( def blink(self, rate: Optional[int] = None) -> Optional[int]: """Updates the blink register""" - # pylint: disable=no-else-return # This needs to be refactored when it can be tested if rate is None: return (self._register(_CONFIG_BANK, _BLINK_REGISTER) & 0x07) * 270 @@ -365,8 +367,7 @@ def pixel_addr(x: int, y: int) -> int: """Calulate the offset into the device array for x,y pixel""" return x + y * 16 - # pylint: disable-msg=too-many-arguments - def pixel( + def pixel( # noqa: PLR0913, PLR0912, Too many arguments in function definition, Too many branches self, x: int, y: int, @@ -385,7 +386,6 @@ def pixel( :param frame: int the frame to set the pixel, default 0 :param rotate: int display rotation (0, 90, 180, 270) """ - # pylint: disable=too-many-branches if rotate not in (0, 90, 180, 270): raise ValueError("Rotation must be 0, 90, 180, or 270 degrees") @@ -436,11 +436,7 @@ def pixel( self._register(frame, _BLINK_OFFSET + addr, bits) return None - # pylint: enable-msg=too-many-arguments - - def image( - self, img: Image, frame: Optional[int] = None, blink: bool = False - ) -> None: + def image(self, img: Image, frame: Optional[int] = None, blink: bool = False) -> None: """Set buffer to value of Python Imaging Library image. The image should be in 8-bit mode (L) and a size equal to the display size. @@ -453,9 +449,7 @@ def image( imwidth, imheight = img.size if imwidth != self.width or imheight != self.height: raise ValueError( - "Image must be same dimensions as display ({0}x{1}).".format( - self.width, self.height - ) + f"Image must be same dimensions as display ({self.width}x{self.height})." ) # Grab all the pixels from the image, faster than getpixel. pixels = img.load() diff --git a/adafruit_is31fl3731/keybow2040.py b/adafruit_is31fl3731/keybow2040.py index ebb8be2..21c2f31 100644 --- a/adafruit_is31fl3731/keybow2040.py +++ b/adafruit_is31fl3731/keybow2040.py @@ -37,9 +37,9 @@ class Keybow2040(IS31FL3731): width = 16 height = 3 - # pylint: disable=too-many-arguments - - def pixelrgb(self, x, y, r, g, b, blink=None, frame=None): + def pixelrgb( # noqa: PLR0913 Too many arguments in function definition + self, x, y, r, g, b, blink=None, frame=None + ): """ Blink or brightness for x, y-pixel @@ -57,10 +57,6 @@ def pixelrgb(self, x, y, r, g, b, blink=None, frame=None): super().pixel(x, 1, g, blink, frame) super().pixel(x, 2, b, blink, frame) - # pylint: disable=inconsistent-return-statements - # pylint: disable=too-many-return-statements - # pylint: disable=too-many-branches - @staticmethod def pixel_addr(x, y): lookup = [ diff --git a/adafruit_is31fl3731/led_shim.py b/adafruit_is31fl3731/led_shim.py index fbba938..ca090ec 100644 --- a/adafruit_is31fl3731/led_shim.py +++ b/adafruit_is31fl3731/led_shim.py @@ -39,8 +39,9 @@ class LedShim(IS31FL3731): def __init__(self, i2c, address=0x75): super().__init__(i2c, address) - # pylint: disable-msg=too-many-arguments - def pixelrgb(self, x, r, g, b, blink=None, frame=None): + def pixelrgb( # noqa: PLR0913 Too many arguments in function definition + self, x, r, g, b, blink=None, frame=None + ): """ Blink or brightness for x-pixel @@ -55,12 +56,8 @@ def pixelrgb(self, x, r, g, b, blink=None, frame=None): super().pixel(x, 1, g, blink, frame) super().pixel(x, 2, b, blink, frame) - # pylint: disable=inconsistent-return-statements - # pylint: disable=too-many-return-statements - # pylint: disable=too-many-branches - @staticmethod - def pixel_addr(x, y): + def pixel_addr(x, y): # noqa: PLR0911, PLR0912, Too many return statements, Too many branches """Translate an x,y coordinate to a pixel index.""" if y == 0: if x < 7: diff --git a/adafruit_is31fl3731/matrix.py b/adafruit_is31fl3731/matrix.py index 73a2409..fa7a5db 100644 --- a/adafruit_is31fl3731/matrix.py +++ b/adafruit_is31fl3731/matrix.py @@ -37,7 +37,7 @@ except ImportError: # placeholder if PIL unavailable Image = None -except ImportError as e: +except ImportError: pass @@ -71,9 +71,7 @@ def image(self, img: Image, frame: Optional[int] = None, blink: bool = False): if img.mode != "L": raise ValueError("Image must be in mode L.") if img.size[0] != self.width or img.size[1] != self.height: - raise ValueError( - f"Image must be same dimensions as display {self.width}x{self.height}" - ) + raise ValueError(f"Image must be same dimensions as display {self.width}x{self.height}") # Frame-select and then write pixel data in one big operation if frame is not None: diff --git a/adafruit_is31fl3731/rgbmatrix5x5.py b/adafruit_is31fl3731/rgbmatrix5x5.py index 4c8092b..504bfe1 100644 --- a/adafruit_is31fl3731/rgbmatrix5x5.py +++ b/adafruit_is31fl3731/rgbmatrix5x5.py @@ -41,8 +41,9 @@ class RGBmatrix5x5(IS31FL3731): width = 25 height = 3 - def pixelrgb(self, x, y, r, g, b, blink=None, frame=None): - # pylint: disable=too-many-arguments + def pixelrgb( # noqa: PLR0913 Too many arguments in function definition + self, x, y, r, g, b, blink=None, frame=None + ): """ Blink or brightness for x, y-pixel diff --git a/docs/conf.py b/docs/conf.py index d0ff19c..3d3363e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- - # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries # # SPDX-License-Identifier: MIT +import datetime import os import sys -import datetime sys.path.insert(0, os.path.abspath("..")) @@ -49,9 +47,7 @@ creation_year = "2017" current_year = str(datetime.datetime.now().year) year_duration = ( - current_year - if current_year == creation_year - else creation_year + " - " + current_year + current_year if current_year == creation_year else creation_year + " - " + current_year ) copyright = year_duration + " Radomir Dopieralski" author = "Radomir Dopieralski" diff --git a/examples/is31fl3731_16x9_charlieplexed_pwm.py b/examples/is31fl3731_16x9_charlieplexed_pwm.py index 6c2878e..5034b80 100644 --- a/examples/is31fl3731_16x9_charlieplexed_pwm.py +++ b/examples/is31fl3731_16x9_charlieplexed_pwm.py @@ -1,9 +1,9 @@ # SPDX-FileCopyrightText: 2024 DJDevon3 # SPDX-License-Identifier: MIT -""" Adafruit 16x9 Charlieplexed PWM LED Matrix Example """ -# pylint: disable=import-error -import board +"""Adafruit 16x9 Charlieplexed PWM LED Matrix Example""" + import adafruit_framebuf +import board from adafruit_is31fl3731.matrix import Matrix as Display @@ -25,9 +25,7 @@ # Create a framebuffer for our display buf = bytearray(32) # 2 bytes tall x 16 wide = 32 bytes (9 bits is 2 bytes) -buffer = adafruit_framebuf.FrameBuffer( - buf, display.width, display.height, adafruit_framebuf.MVLSB -) +buffer = adafruit_framebuf.FrameBuffer(buf, display.width, display.height, adafruit_framebuf.MVLSB) FRAME = 0 # start with frame 0 while True: @@ -44,6 +42,4 @@ bit = 1 << y & bite # if bit > 0 then set the pixel brightness if bit: - display.pixel( - x, y, PIXEL_BRIGHTNESS, blink=PIXEL_BLINK, rotate=PIXEL_ROTATION - ) + display.pixel(x, y, PIXEL_BRIGHTNESS, blink=PIXEL_BLINK, rotate=PIXEL_ROTATION) diff --git a/examples/is31fl3731_frame_example.py b/examples/is31fl3731_frame_example.py index 72d24bd..b8ccea0 100644 --- a/examples/is31fl3731_frame_example.py +++ b/examples/is31fl3731_frame_example.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: MIT import time + import board import busio diff --git a/examples/is31fl3731_keybow_2040_rainbow.py b/examples/is31fl3731_keybow_2040_rainbow.py index e80dac3..5c48133 100644 --- a/examples/is31fl3731_keybow_2040_rainbow.py +++ b/examples/is31fl3731_keybow_2040_rainbow.py @@ -15,18 +15,17 @@ Author(s): Sandy Macdonald. """ -import time import math +import time + import board from adafruit_is31fl3731.keybow2040 import Keybow2040 as Display -# pylint: disable=inconsistent-return-statements -# pylint: disable=too-many-return-statements -# pylint: disable=invalid-name - -def hsv_to_rgb(hue, sat, val): +def hsv_to_rgb( # noqa: PLR0911 Too many return statements + hue, sat, val +): """ Convert HSV colour to RGB @@ -80,8 +79,6 @@ def hsv_to_rgb(hue, sat, val): rgb = hsv_to_rgb(pixel_hue, 1, 1) - display.pixelrgb( - x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255) - ) + display.pixelrgb(x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255)) time.sleep(0.01) diff --git a/examples/is31fl3731_ledshim_fade.py b/examples/is31fl3731_ledshim_fade.py index eb7ecda..1f1d0a0 100644 --- a/examples/is31fl3731_ledshim_fade.py +++ b/examples/is31fl3731_ledshim_fade.py @@ -2,8 +2,10 @@ # SPDX-License-Identifier: MIT import time + import board import busio + from adafruit_is31fl3731.led_shim import LedShim as Display i2c = busio.I2C(board.SCL, board.SDA) diff --git a/examples/is31fl3731_ledshim_rainbow.py b/examples/is31fl3731_ledshim_rainbow.py index 3617c31..94b9ed6 100644 --- a/examples/is31fl3731_ledshim_rainbow.py +++ b/examples/is31fl3731_ledshim_rainbow.py @@ -2,8 +2,10 @@ # SPDX-License-Identifier: MIT import time + import board import busio + from adafruit_is31fl3731.led_shim import LedShim as Display i2c = busio.I2C(board.SCL, board.SDA) diff --git a/examples/is31fl3731_pillow_animated_gif.py b/examples/is31fl3731_pillow_animated_gif.py index 741bf25..19f14b1 100644 --- a/examples/is31fl3731_pillow_animated_gif.py +++ b/examples/is31fl3731_pillow_animated_gif.py @@ -16,6 +16,7 @@ """ import sys + import board from PIL import Image diff --git a/examples/is31fl3731_pillow_marquee.py b/examples/is31fl3731_pillow_marquee.py index ecf0d83..35d0d23 100644 --- a/examples/is31fl3731_pillow_marquee.py +++ b/examples/is31fl3731_pillow_marquee.py @@ -47,7 +47,5 @@ while True: for x in range(text_width + display.width): draw.rectangle((0, 0, display.width, display.height), outline=0, fill=0) - image.paste( - text_image, (display.width - x, display.height // 2 - text_height // 2 - 1) - ) + image.paste(text_image, (display.width - x, display.height // 2 - text_height // 2 - 1)) display.image(image) diff --git a/examples/is31fl3731_rgbmatrix5x5_rainbow.py b/examples/is31fl3731_rgbmatrix5x5_rainbow.py index d6b2442..1fd97ff 100644 --- a/examples/is31fl3731_rgbmatrix5x5_rainbow.py +++ b/examples/is31fl3731_rgbmatrix5x5_rainbow.py @@ -13,16 +13,18 @@ Author(s): Sandy Macdonald, David Glaude, James Carr """ -import time import math -import busio +import time + import board +import busio from adafruit_is31fl3731.rgbmatrix5x5 import RGBmatrix5x5 as Display -def hsv_to_rgb(hue, sat, val): - # pylint: disable=too-many-return-statements +def hsv_to_rgb( # noqa: PLR0911 Too many return statements + hue, sat, val +): """ Convert HSV colour to RGB @@ -56,9 +58,6 @@ def hsv_to_rgb(hue, sat, val): if i == 5: return val, p, q - # Will never reach here but it keeps pylint happier - return val, val, val - # Create the I2C bus on a Pico Explorer Base i2c = busio.I2C(board.GP5, board.GP4) @@ -107,9 +106,7 @@ def test_rainbow_sweep(): rgb = hsv_to_rgb(pixel_hue, 1, 1) - display.pixelrgb( - x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255) - ) + display.pixelrgb(x, y, int(rgb[0] * 255), int(rgb[1] * 255), int(rgb[2] * 255)) time.sleep(0.01) step += 3 diff --git a/examples/is31fl3731_text_example.py b/examples/is31fl3731_text_example.py index 66d64a6..b763713 100644 --- a/examples/is31fl3731_text_example.py +++ b/examples/is31fl3731_text_example.py @@ -1,9 +1,9 @@ # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries # SPDX-License-Identifier: MIT +import adafruit_framebuf import board import busio -import adafruit_framebuf # uncomment next line if you are using Feather CharlieWing LED 15 x 7 # from adafruit_is31fl3731.charlie_wing import CharlieWing as Display @@ -28,9 +28,7 @@ # Create a framebuffer for our display buf = bytearray(32) # 2 bytes tall x 16 wide = 32 bytes (9 bits is 2 bytes) -fb = adafruit_framebuf.FrameBuffer( - buf, display.width, display.height, adafruit_framebuf.MVLSB -) +fb = adafruit_framebuf.FrameBuffer(buf, display.width, display.height, adafruit_framebuf.MVLSB) frame = 0 # start with frame 0 diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..db37c83 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,99 @@ +# SPDX-FileCopyrightText: 2024 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +target-version = "py38" +line-length = 100 + +[lint] +select = ["I", "PL", "UP"] + +extend-select = [ + "D419", # empty-docstring + "E501", # line-too-long + "W291", # trailing-whitespace + "PLC0414", # useless-import-alias + "PLC2401", # non-ascii-name + "PLC2801", # unnecessary-dunder-call + "PLC3002", # unnecessary-direct-lambda-call + "E999", # syntax-error + "PLE0101", # return-in-init + "F706", # return-outside-function + "F704", # yield-outside-function + "PLE0116", # continue-in-finally + "PLE0117", # nonlocal-without-binding + "PLE0241", # duplicate-bases + "PLE0302", # unexpected-special-method-signature + "PLE0604", # invalid-all-object + "PLE0605", # invalid-all-format + "PLE0643", # potential-index-error + "PLE0704", # misplaced-bare-raise + "PLE1141", # dict-iter-missing-items + "PLE1142", # await-outside-async + "PLE1205", # logging-too-many-args + "PLE1206", # logging-too-few-args + "PLE1307", # bad-string-format-type + "PLE1310", # bad-str-strip-call + "PLE1507", # invalid-envvar-value + "PLE2502", # bidirectional-unicode + "PLE2510", # invalid-character-backspace + "PLE2512", # invalid-character-sub + "PLE2513", # invalid-character-esc + "PLE2514", # invalid-character-nul + "PLE2515", # invalid-character-zero-width-space + "PLR0124", # comparison-with-itself + "PLR0202", # no-classmethod-decorator + "PLR0203", # no-staticmethod-decorator + "UP004", # useless-object-inheritance + "PLR0206", # property-with-parameters + "PLR0904", # too-many-public-methods + "PLR0911", # too-many-return-statements + "PLR0912", # too-many-branches + "PLR0913", # too-many-arguments + "PLR0914", # too-many-locals + "PLR0915", # too-many-statements + "PLR0916", # too-many-boolean-expressions + "PLR1702", # too-many-nested-blocks + "PLR1704", # redefined-argument-from-local + "PLR1711", # useless-return + "C416", # unnecessary-comprehension + "PLR1733", # unnecessary-dict-index-lookup + "PLR1736", # unnecessary-list-index-lookup + + # ruff reports this rule is unstable + #"PLR6301", # no-self-use + + "PLW0108", # unnecessary-lambda + "PLW0120", # useless-else-on-loop + "PLW0127", # self-assigning-variable + "PLW0129", # assert-on-string-literal + "B033", # duplicate-value + "PLW0131", # named-expr-without-context + "PLW0245", # super-without-brackets + "PLW0406", # import-self + "PLW0602", # global-variable-not-assigned + "PLW0603", # global-statement + "PLW0604", # global-at-module-level + + # fails on the try: import typing used by libraries + #"F401", # unused-import + + "F841", # unused-variable + "E722", # bare-except + "PLW0711", # binary-op-exception + "PLW1501", # bad-open-mode + "PLW1508", # invalid-envvar-default + "PLW1509", # subprocess-popen-preexec-fn + "PLW2101", # useless-with-lock + "PLW3301", # nested-min-max +] + +ignore = [ + "PLR2004", # magic-value-comparison + "UP030", # format literals + "PLW1514", # unspecified-encoding + +] + +[format] +line-ending = "lf"