diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..21c125c --- /dev/null +++ b/.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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70ade69..ff19dde 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,42 +1,21 @@ -# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò +# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries # # 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 63f1395..7288ae5 100644 --- a/README.rst +++ b/README.rst @@ -13,9 +13,9 @@ :target: https://github.com/adafruit/Adafruit_CircuitPython_HT16K33/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 This is a library for using the I²C-based LED matrices with the HT16K33 chip. It supports both 16x8 and 8x8 matrices, as well as 7- and 14-segment displays. diff --git a/adafruit_ht16k33/animations.py b/adafruit_ht16k33/animations.py index 52e9d02..aeeca05 100644 --- a/adafruit_ht16k33/animations.py +++ b/adafruit_ht16k33/animations.py @@ -18,6 +18,7 @@ try: from typing import List + from adafruit_ht16k33.segments import Seg14x4 except ImportError: pass @@ -40,9 +41,6 @@ A = 1 -# pylint: disable=invalid-name - - class Animation: """Animation class for the htk33 Main driver for all alphanumeric display animations (WIP!!!) @@ -86,9 +84,7 @@ def animate( for bits in bitmasks: if not 0 <= bits <= 0xFFFF: - raise ValueError( - "Bitmask value must be an integer in the range: 0-65535" - ) + raise ValueError("Bitmask value must be an integer in the range: 0-65535") self._display.set_digit_raw(dig, bits) diff --git a/adafruit_ht16k33/bargraph.py b/adafruit_ht16k33/bargraph.py index bf201ad..1f99b39 100644 --- a/adafruit_ht16k33/bargraph.py +++ b/adafruit_ht16k33/bargraph.py @@ -12,7 +12,6 @@ from adafruit_ht16k33.ht16k33 import HT16K33 - __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HT16K33.git" diff --git a/adafruit_ht16k33/ht16k33.py b/adafruit_ht16k33/ht16k33.py index 32ce648..d48f27d 100644 --- a/adafruit_ht16k33/ht16k33.py +++ b/adafruit_ht16k33/ht16k33.py @@ -15,7 +15,8 @@ from micropython import const try: - from typing import Union, List, Tuple, Optional + from typing import List, Optional, Tuple, Union + from busio import I2C except ImportError: pass @@ -83,9 +84,7 @@ def blink_rate(self, rate: int) -> None: rate = rate & 0x03 self._blink_rate = rate for index, _ in enumerate(self.i2c_device): - self._write_cmd( - _HT16K33_BLINK_CMD | _HT16K33_BLINK_DISPLAYON | rate << 1, index - ) + self._write_cmd(_HT16K33_BLINK_CMD | _HT16K33_BLINK_DISPLAYON | rate << 1, index) @property def brightness(self) -> float: @@ -95,9 +94,7 @@ def brightness(self) -> float: @brightness.setter def brightness(self, brightness: float) -> None: if not 0.0 <= brightness <= 1.0: - raise ValueError( - "Brightness must be a decimal number in the range: 0.0-1.0" - ) + raise ValueError("Brightness must be a decimal number in the range: 0.0-1.0") self._brightness = brightness xbright = round(15 * brightness) diff --git a/adafruit_ht16k33/matrix.py b/adafruit_ht16k33/matrix.py index 39e2eb1..cdd6ddc 100644 --- a/adafruit_ht16k33/matrix.py +++ b/adafruit_ht16k33/matrix.py @@ -8,12 +8,14 @@ ======================= """ + from adafruit_ht16k33.ht16k33 import HT16K33 try: - from typing import Optional, Tuple, Union, List - from circuitpython_typing.pil import Image + from typing import List, Optional, Tuple, Union + from busio import I2C + from circuitpython_typing.pil import Image except ImportError: pass @@ -52,7 +54,6 @@ def __setitem__(self, key: Tuple[int, int], value: Optional[bool]) -> None: x, y = key self.pixel(x, y, value) - # pylint: disable=too-many-branches def shift(self, x: int, y: int, rotate: bool = False) -> None: """ Shift pixels by x and y @@ -197,7 +198,7 @@ def pixel(self, x: int, y: int, color: Optional[bool] = None) -> Optional[bool]: x -= 8 y += 8 - return super()._pixel(y, x, color) # pylint: disable=arguments-out-of-order + return super()._pixel(y, x, color) class MatrixBackpack16x8(Matrix16x8): diff --git a/adafruit_ht16k33/segments.py b/adafruit_ht16k33/segments.py index 0b8e142..25a64e2 100644 --- a/adafruit_ht16k33/segments.py +++ b/adafruit_ht16k33/segments.py @@ -7,11 +7,14 @@ adafruit_ht16k33.segments ========================= """ + import time + from adafruit_ht16k33.ht16k33 import HT16K33 try: - from typing import Union, List, Tuple, Optional, Dict + from typing import Dict, List, Optional, Tuple, Union + from busio import I2C except ImportError: pass @@ -21,7 +24,7 @@ # fmt: off CHARS = ( - 0b00000000, 0b00000000, # + 0b00000000, 0b00000000, 0b01000000, 0b00000110, # ! 0b00000010, 0b00100000, # " 0b00010010, 0b11001110, # # @@ -181,9 +184,7 @@ def __init__( ) -> None: super().__init__(i2c, address, auto_write) if not 1 <= chars_per_display <= 8: - raise ValueError( - "Input overflow - The HT16K33 only supports up 1-8 characters!" - ) + raise ValueError("Input overflow - The HT16K33 only supports up 1-8 characters!") self._chars = chars_per_display * len(self.i2c_device) self._bytes_per_char = 2 @@ -206,7 +207,7 @@ def print(self, value: Union[str, float], decimal: int = 0) -> None: elif isinstance(value, (int, float)): self._number(value, decimal) else: - raise ValueError("Unsupported display value type: {}".format(type(value))) + raise ValueError(f"Unsupported display value type: {type(value)}") if self._auto_write: self.show() @@ -217,7 +218,7 @@ def print_hex(self, value: Union[int, str]) -> None: """ if isinstance(value, int): - self.print("{0:X}".format(value)) + self.print(f"{value:X}") else: self.print(value) @@ -262,8 +263,7 @@ def _push(self, char: str) -> None: """Scroll the display and add a character at the end.""" if ( char != "." - or self._get_buffer(self._char_buffer_index(self._chars - 1) + 1) - & 0b01000000 + or self._get_buffer(self._char_buffer_index(self._chars - 1) + 1) & 0b01000000 ): self.scroll() self._put(" ", self._chars - 1) @@ -293,9 +293,7 @@ def _number(self, number: float, decimal: int = 0) -> str: if (len(stnum) > self._chars + 1) or ((len(stnum) > self._chars) and (dot < 0)): self._auto_write = auto_write - raise ValueError( - "Input overflow - {0} is too large for the display!".format(number) - ) + raise ValueError(f"Input overflow - {number} is too large for the display!") if dot < 0: # No decimal point (Integer) @@ -319,7 +317,7 @@ def _number(self, number: float, decimal: int = 0) -> str: if len(txt) > self._chars + 1: self._auto_write = auto_write - raise ValueError("Output string ('{0}') is too long!".format(txt)) + raise ValueError(f"Output string ('{txt}') is too long!") self._text(txt) self._auto_write = auto_write @@ -341,9 +339,7 @@ def _char_buffer_index(self, char_pos: int) -> int: offset = (char_pos // self._chars_per_buffer()) * self._buffer_size return offset + (char_pos % self._chars_per_buffer()) * self._bytes_per_char - def set_digit_raw( - self, index: int, bitmask: Union[int, List[int], Tuple[int, int]] - ) -> None: + def set_digit_raw(self, index: int, bitmask: Union[int, List[int], Tuple[int, int]]) -> None: """Set digit at position to raw bitmask value. Position should be a value of 0 to 3 with 0 being the left most character on the display. @@ -352,9 +348,7 @@ def set_digit_raw( :type bitmask: int, or a list/tuple of int """ if not isinstance(index, int) or not 0 <= index <= self._chars - 1: - raise ValueError( - f"Index value must be an integer in the range: 0-{self._chars - 1}" - ) + raise ValueError(f"Index value must be an integer in the range: 0-{self._chars - 1}") if isinstance(bitmask, (tuple, list)): bitmask = ((bitmask[0] & 0xFF) << 8) | (bitmask[1] & 0xFF) @@ -387,7 +381,6 @@ def non_blocking_marquee( :param bool space_between: (optional) Whether to seperate the end and beginning of the text with a space. (default=False) """ - # pylint: disable=too-many-nested-blocks if isinstance(text, str): now = time.monotonic() # if text is the same @@ -448,7 +441,7 @@ def marquee( class _AbstractSeg7x4(Seg14x4): POSITIONS = (0, 2, 6, 8) # The positions of characters. - def __init__( # pylint: disable=too-many-arguments + def __init__( self, i2c: I2C, address: Union[int, List[int], Tuple[int, ...]] = 0x70, @@ -486,17 +479,13 @@ def _push(self, char: str) -> None: if char in ":;": self._put(char) else: - if ( - char != "." - or self._get_buffer(self._adjusted_index(self._chars - 1)) & 0b10000000 - ): + if char != "." or self._get_buffer(self._adjusted_index(self._chars - 1)) & 0b10000000: self.scroll() self._put(" ", self._chars - 1) self._put(char, self._chars - 1) def _put(self, char: str, index: int = 0) -> None: """Put a character at the specified place.""" - # pylint: disable=too-many-return-statements if not 0 <= index < self._chars: return index = self._adjusted_index(index) @@ -541,9 +530,7 @@ def set_digit_raw(self, index: int, bitmask: int) -> None: """ if not isinstance(index, int) or not 0 <= index < self._chars: - raise ValueError( - f"Index value must be an integer in the range: 0-{self._chars - 1}" - ) + raise ValueError(f"Index value must be an integer in the range: 0-{self._chars - 1}") # Set the digit bitmask value at the appropriate position. self._set_buffer(self._adjusted_index(index), bitmask & 0xFF) @@ -567,7 +554,7 @@ class Seg7x4(_AbstractSeg7x4): on each display. """ - def __init__( # pylint: disable=too-many-arguments + def __init__( self, i2c: I2C, address: Union[int, List[int], Tuple[int, ...]] = 0x70, @@ -668,8 +655,6 @@ def ampm(self, value: bool) -> None: class Colon: """Helper class for controlling the colons. Not intended for direct use.""" - # pylint: disable=protected-access - MASKS = (0x02, 0x0C) def __init__(self, disp: _AbstractSeg7x4, num_of_colons: int = 1) -> None: diff --git a/docs/api.rst b/docs/api.rst index 70452e2..4d7999a 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -1,6 +1,9 @@ .. If you created a package, create one automodule per module in the package. +API Reference +############# + .. automodule:: adafruit_ht16k33.ht16k33 :members: diff --git a/docs/conf.py b/docs/conf.py index a0ebdf9..448adfd 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 = "2016" 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/ht16k33_animation_demo.py b/examples/ht16k33_animation_demo.py index 26b643c..9ff1030 100644 --- a/examples/ht16k33_animation_demo.py +++ b/examples/ht16k33_animation_demo.py @@ -2,15 +2,17 @@ # SPDX-License-Identifier: MIT """ - Test script for display animations on an HT16K33 with alphanumeric display +Test script for display animations on an HT16K33 with alphanumeric display - The display must be initialized with auto_write=False. +The display must be initialized with auto_write=False. """ from time import sleep + import board -from adafruit_ht16k33.segments import Seg14x4 + from adafruit_ht16k33.animations import Animation +from adafruit_ht16k33.segments import Seg14x4 # Initialize the I2C bus i2c = board.I2C() # uses board.SCL and board.SDA diff --git a/examples/ht16k33_matrix_multi_display.py b/examples/ht16k33_matrix_multi_display.py index c4f77e7..59596bd 100644 --- a/examples/ht16k33_matrix_multi_display.py +++ b/examples/ht16k33_matrix_multi_display.py @@ -8,13 +8,13 @@ # Import all board pins. import time + import board import busio # Import the HT16K33 LED matrix module. from adafruit_ht16k33 import matrix - # Create the I2C interface. i2c = busio.I2C(board.SCL, board.SDA) diff --git a/examples/ht16k33_matrix_simpletest.py b/examples/ht16k33_matrix_simpletest.py index d0ef10f..2896c2c 100644 --- a/examples/ht16k33_matrix_simpletest.py +++ b/examples/ht16k33_matrix_simpletest.py @@ -8,13 +8,13 @@ # Import all board pins. import time + import board import busio # Import the HT16K33 LED matrix module. from adafruit_ht16k33 import matrix - # Create the I2C interface. i2c = busio.I2C(board.SCL, board.SDA) diff --git a/examples/ht16k33_matrix_text_example.py b/examples/ht16k33_matrix_text_example.py index d0708b7..6cbd492 100644 --- a/examples/ht16k33_matrix_text_example.py +++ b/examples/ht16k33_matrix_text_example.py @@ -5,9 +5,9 @@ # Requires: adafruit_framebuf +import adafruit_framebuf import board import busio -import adafruit_framebuf # Import the HT16K33 LED matrix module. from adafruit_ht16k33 import matrix diff --git a/examples/ht16k33_segments_14x4_demo.py b/examples/ht16k33_segments_14x4_demo.py index db11fc4..8bacb8b 100644 --- a/examples/ht16k33_segments_14x4_demo.py +++ b/examples/ht16k33_segments_14x4_demo.py @@ -2,7 +2,9 @@ # SPDX-License-Identifier: MIT import time + import board + from adafruit_ht16k33 import segments # Create the display object. diff --git a/examples/ht16k33_segments_7x4customchars.py b/examples/ht16k33_segments_7x4customchars.py index 698adfb..cecc3cc 100644 --- a/examples/ht16k33_segments_7x4customchars.py +++ b/examples/ht16k33_segments_7x4customchars.py @@ -8,8 +8,10 @@ # Import all board pins. import time + import board import busio + from adafruit_ht16k33 import segments # Create the character dictionary diff --git a/examples/ht16k33_segments_non_blocking_marquee.py b/examples/ht16k33_segments_non_blocking_marquee.py index f519748..75f7bb5 100644 --- a/examples/ht16k33_segments_non_blocking_marquee.py +++ b/examples/ht16k33_segments_non_blocking_marquee.py @@ -7,10 +7,11 @@ """ import time + import board import neopixel -import adafruit_ht16k33.segments +import adafruit_ht16k33.segments i2c = board.I2C() segment_display = adafruit_ht16k33.segments.Seg14x4(i2c) diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..63d30e5 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,107 @@ +# SPDX-FileCopyrightText: 2024 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +target-version = "py38" +line-length = 100 + +[lint] +preview = true +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 + "PLR0913", # too-many-arguments + "PLR0915", # too-many-statements + "PLR0917", # too-many-positional-arguments + "PLR0904", # too-many-public-methods + "PLR0912", # too-many-branches + "PLR0916", # too-many-boolean-expressions + "PLR1702", # too-many-nested-blocks + "PLR0911", # too-many-returns +] + +[format] +line-ending = "lf"