From 22ddc5a4e459d12d89819e5818c78b997b0f3056 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Wed, 14 May 2025 19:51:28 +0000 Subject: [PATCH] change to ruff --- .gitattributes | 11 + .pre-commit-config.yaml | 43 +-- .pylintrc | 399 -------------------- README.rst | 6 +- adafruit_mcp230xx/digital_inout.py | 18 +- adafruit_mcp230xx/mcp23008.py | 10 +- adafruit_mcp230xx/mcp23016.py | 10 +- adafruit_mcp230xx/mcp23017.py | 10 +- adafruit_mcp230xx/mcp230xx.py | 9 +- adafruit_mcp230xx/mcp23s08.py | 9 +- adafruit_mcp230xx/mcp23s17.py | 8 +- adafruit_mcp230xx/mcp23sxx.py | 6 +- adafruit_mcp230xx/mcp23xxx.py | 10 +- docs/api.rst | 3 + docs/conf.py | 6 +- examples/mcp230xx_event_detect_interrupt.py | 5 +- examples/mcp230xx_leds_and_buttons.py | 1 + examples/mcp230xx_leds_and_buttons_irq.py | 1 + examples/mcp230xx_simpletest.py | 2 +- examples/mcp23Sxx_event_detect_interrupt.py | 5 +- examples/mcp23Sxx_simpletest.py | 2 +- ruff.toml | 105 ++++++ 22 files changed, 184 insertions(+), 495 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..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 498b8c5..b42e4d9 100644 --- a/README.rst +++ b/README.rst @@ -13,9 +13,9 @@ Introduction :target: https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx/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 module for the MCP23017/08 I2C and MCP23S17/08 SPI I/O extenders. diff --git a/adafruit_mcp230xx/digital_inout.py b/adafruit_mcp230xx/digital_inout.py index 17e8dcd..c54668b 100644 --- a/adafruit_mcp230xx/digital_inout.py +++ b/adafruit_mcp230xx/digital_inout.py @@ -16,8 +16,10 @@ try: from typing import Optional + + from digitalio import Direction, Pull + from adafruit_mcp230xx.mcp23xxx import MCP23XXX - from digitalio import Pull, Direction except ImportError: pass @@ -60,7 +62,6 @@ def __init__(self, pin_number: int, mcp230xx: MCP23XXX) -> None: # with DigitalInout class (which allows specifying pull, etc. which # is unused by this class). Do not remove them, instead turn off pylint # in this case. - # pylint: disable=unused-argument def switch_to_output(self, value: bool = False, **kwargs) -> None: """Switch the pin state to a digital output with the provided starting value (True/False for high or low, default is False/low). @@ -68,9 +69,7 @@ def switch_to_output(self, value: bool = False, **kwargs) -> None: self.direction = digitalio.Direction.OUTPUT self.value = value - def switch_to_input( - self, pull: Pull = None, invert_polarity: bool = False, **kwargs - ) -> None: + def switch_to_input(self, pull: Pull = None, invert_polarity: bool = False, **kwargs) -> None: """Switch the pin state to a digital input with the provided starting pull-up resistor state (optional, no pull-up by default) and input polarity. Note that pull-down resistors are NOT supported! @@ -79,8 +78,6 @@ def switch_to_input( self.pull = pull self.invert_polarity = invert_polarity - # pylint: enable=unused-argument - @property def value(self) -> bool: """The value of the pin, either True for high or False for @@ -159,8 +156,7 @@ def invert_polarity(self, val: bool) -> None: self._mcp.ipol = _enable_bit(self._mcp.ipol, self._pin) else: raise ValueError("Inverted polarity is not supported.") + elif hasattr(self._mcp, "ipol"): + self._mcp.ipol = _clear_bit(self._mcp.ipol, self._pin) else: - if hasattr(self._mcp, "ipol"): - self._mcp.ipol = _clear_bit(self._mcp.ipol, self._pin) - else: - return + return diff --git a/adafruit_mcp230xx/mcp23008.py b/adafruit_mcp230xx/mcp23008.py index aaf3239..ffdd1d4 100644 --- a/adafruit_mcp230xx/mcp23008.py +++ b/adafruit_mcp230xx/mcp23008.py @@ -22,11 +22,13 @@ """ from micropython import const -from .mcp230xx import MCP230XX + from .digital_inout import DigitalInOut +from .mcp230xx import MCP230XX try: - import typing # pylint: disable=unused-import + import typing + from busio import I2C except ImportError: pass @@ -52,9 +54,7 @@ class MCP23008(MCP230XX): at the specified I2C address. """ - def __init__( - self, i2c: I2C, address: int = _MCP23008_ADDRESS, reset: bool = True - ) -> None: + def __init__(self, i2c: I2C, address: int = _MCP23008_ADDRESS, reset: bool = True) -> None: super().__init__(i2c, address) if reset: diff --git a/adafruit_mcp230xx/mcp23016.py b/adafruit_mcp230xx/mcp23016.py index 972c180..cfd93c9 100644 --- a/adafruit_mcp230xx/mcp23016.py +++ b/adafruit_mcp230xx/mcp23016.py @@ -21,11 +21,13 @@ """ from micropython import const -from .mcp230xx import MCP230XX + from .digital_inout import DigitalInOut +from .mcp230xx import MCP230XX try: - import typing # pylint: disable=unused-import + import typing + from busio import I2C except ImportError: pass @@ -51,9 +53,7 @@ class MCP23016(MCP230XX): at the specified I2C address. """ - def __init__( - self, i2c: I2C, address: int = _MCP23016_ADDRESS, reset: bool = True - ) -> None: + def __init__(self, i2c: I2C, address: int = _MCP23016_ADDRESS, reset: bool = True) -> None: super().__init__(i2c, address) if reset: diff --git a/adafruit_mcp230xx/mcp23017.py b/adafruit_mcp230xx/mcp23017.py index 6ffc056..a77a49e 100644 --- a/adafruit_mcp230xx/mcp23017.py +++ b/adafruit_mcp230xx/mcp23017.py @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: MIT -# pylint: disable=too-many-public-methods - """ `mcp23017` ==================================================== @@ -27,11 +25,13 @@ """ from micropython import const -from .mcp230xx import MCP230XX + from .digital_inout import DigitalInOut +from .mcp230xx import MCP230XX try: from typing import List + from busio import I2C except ImportError: pass @@ -63,9 +63,7 @@ class MCP23017(MCP230XX): at the specified I2C address. """ - def __init__( - self, i2c: I2C, address: int = _MCP23017_ADDRESS, reset: bool = True - ) -> None: + def __init__(self, i2c: I2C, address: int = _MCP23017_ADDRESS, reset: bool = True) -> None: super().__init__(i2c, address) if reset: # Reset to all inputs with no pull-ups and no inverted polarity. diff --git a/adafruit_mcp230xx/mcp230xx.py b/adafruit_mcp230xx/mcp230xx.py index ab1f782..f76afad 100644 --- a/adafruit_mcp230xx/mcp230xx.py +++ b/adafruit_mcp230xx/mcp230xx.py @@ -24,7 +24,6 @@ _BUFFER = bytearray(3) -# pylint: disable=too-few-public-methods class MCP230XX(MCP23XXX): """Base class for MCP230xx devices.""" @@ -34,9 +33,7 @@ def _read_u16le(self, register: int) -> int: with self._device as bus_device: _BUFFER[0] = register & 0xFF - bus_device.write_then_readinto( - _BUFFER, _BUFFER, out_end=1, in_start=1, in_end=3 - ) + bus_device.write_then_readinto(_BUFFER, _BUFFER, out_end=1, in_start=1, in_end=3) return (_BUFFER[2] << 8) | _BUFFER[1] def _write_u16le(self, register: int, val: int) -> None: @@ -53,9 +50,7 @@ def _read_u8(self, register: int) -> int: with self._device as bus_device: _BUFFER[0] = register & 0xFF - bus_device.write_then_readinto( - _BUFFER, _BUFFER, out_end=1, in_start=1, in_end=2 - ) + bus_device.write_then_readinto(_BUFFER, _BUFFER, out_end=1, in_start=1, in_end=2) return _BUFFER[1] def _write_u8(self, register: int, val: int) -> None: diff --git a/adafruit_mcp230xx/mcp23s08.py b/adafruit_mcp230xx/mcp23s08.py index 2608626..2a267dd 100644 --- a/adafruit_mcp230xx/mcp23s08.py +++ b/adafruit_mcp230xx/mcp23s08.py @@ -14,13 +14,15 @@ """ from micropython import const -from .mcp23sxx import MCP23SXX + from .digital_inout import DigitalInOut +from .mcp23sxx import MCP23SXX try: - import typing # pylint: disable=unused-import - from busio import SPI + import typing + import digitalio + from busio import SPI except ImportError: pass @@ -40,7 +42,6 @@ _MCP23S08_GPIO = const(0x09) -# pylint: disable=too-many-arguments class MCP23S08(MCP23SXX): """Supports MCP23S08 instance on specified I2C bus and optionally at the specified I2C address. diff --git a/adafruit_mcp230xx/mcp23s17.py b/adafruit_mcp230xx/mcp23s17.py index a90efc9..f18e394 100644 --- a/adafruit_mcp230xx/mcp23s17.py +++ b/adafruit_mcp230xx/mcp23s17.py @@ -14,13 +14,15 @@ """ from micropython import const -from .mcp23sxx import MCP23SXX + from .digital_inout import DigitalInOut +from .mcp23sxx import MCP23SXX try: from typing import List - from busio import SPI + import digitalio + from busio import SPI except ImportError: pass @@ -46,8 +48,6 @@ _MCP23S17_INTCAPB = const(0x11) -# pylint: disable=too-many-arguments -# pylint: disable=too-many-public-methods class MCP23S17(MCP23SXX): """Supports MCP23S17 instance on specified SPI bus and optionally at the specified SPI address. diff --git a/adafruit_mcp230xx/mcp23sxx.py b/adafruit_mcp230xx/mcp23sxx.py index cba0c64..d02400d 100644 --- a/adafruit_mcp230xx/mcp23sxx.py +++ b/adafruit_mcp230xx/mcp23sxx.py @@ -16,9 +16,10 @@ from .mcp23xxx import MCP23XXX try: - import typing # pylint: disable=unused-import - from busio import SPI + import typing + import digitalio + from busio import SPI except ImportError: pass @@ -34,7 +35,6 @@ MCP23SXX_CODE_WRITE = 0x40 -# pylint: disable=too-few-public-methods class MCP23SXX(MCP23XXX): """Base class for MCP23Sxx devices.""" diff --git a/adafruit_mcp230xx/mcp23xxx.py b/adafruit_mcp230xx/mcp23xxx.py index b1b6012..14b4fdb 100644 --- a/adafruit_mcp230xx/mcp23xxx.py +++ b/adafruit_mcp230xx/mcp23xxx.py @@ -14,9 +14,10 @@ from adafruit_bus_device import i2c_device, spi_device try: - from typing import Union, Optional - from busio import I2C, SPI + from typing import Optional, Union + import digitalio + from busio import I2C, SPI except ImportError: pass @@ -24,7 +25,6 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx.git" -# pylint: disable=too-few-public-methods class MCP23XXX: """Base class for MCP23xxx devices.""" @@ -38,6 +38,4 @@ def __init__( if chip_select is None: self._device = i2c_device.I2CDevice(bus_device, address) else: - self._device = spi_device.SPIDevice( - bus_device, chip_select, baudrate=baudrate - ) + self._device = spi_device.SPIDevice(bus_device, chip_select, baudrate=baudrate) diff --git a/docs/api.rst b/docs/api.rst index 181ba82..89b87f5 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -4,6 +4,9 @@ .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py) .. use this format as the module name: "adafruit_foo.foo" +API Reference +############# + .. automodule:: adafruit_mcp230xx.mcp23xxx :members: diff --git a/docs/conf.py b/docs/conf.py index 6e259bb..841a9ff 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -4,9 +4,9 @@ # -*- coding: utf-8 -*- +import datetime import os import sys -import datetime sys.path.insert(0, os.path.abspath("..")) @@ -52,9 +52,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 + " Tony DiCola" author = "Tony DiCola" diff --git a/examples/mcp230xx_event_detect_interrupt.py b/examples/mcp230xx_event_detect_interrupt.py index f0338a6..cd74789 100644 --- a/examples/mcp230xx_event_detect_interrupt.py +++ b/examples/mcp230xx_event_detect_interrupt.py @@ -8,6 +8,7 @@ import busio from digitalio import Direction, Pull from RPi import GPIO + from adafruit_mcp230xx.mcp23017 import MCP23017 # Initialize the I2C bus: @@ -47,8 +48,8 @@ def print_interrupt(port): """Callback function to be called when an Interrupt occurs.""" for pin_flag in mcp.int_flag: - print("Interrupt connected to Pin: {}".format(port)) - print("Pin number: {} changed to: {}".format(pin_flag, pins[pin_flag].value)) + print(f"Interrupt connected to Pin: {port}") + print(f"Pin number: {pin_flag} changed to: {pins[pin_flag].value}") mcp.clear_ints() diff --git a/examples/mcp230xx_leds_and_buttons.py b/examples/mcp230xx_leds_and_buttons.py index be2839c..d24e095 100644 --- a/examples/mcp230xx_leds_and_buttons.py +++ b/examples/mcp230xx_leds_and_buttons.py @@ -5,6 +5,7 @@ import board import busio from digitalio import Direction, Pull + from adafruit_mcp230xx.mcp23017 import MCP23017 # Initialize the I2C bus: diff --git a/examples/mcp230xx_leds_and_buttons_irq.py b/examples/mcp230xx_leds_and_buttons_irq.py index fc3aaa4..a7f894c 100644 --- a/examples/mcp230xx_leds_and_buttons_irq.py +++ b/examples/mcp230xx_leds_and_buttons_irq.py @@ -5,6 +5,7 @@ import board import busio from digitalio import DigitalInOut, Direction, Pull + from adafruit_mcp230xx.mcp23017 import MCP23017 # Initialize the I2C bus: diff --git a/examples/mcp230xx_simpletest.py b/examples/mcp230xx_simpletest.py index e5295e7..2abce81 100644 --- a/examples/mcp230xx_simpletest.py +++ b/examples/mcp230xx_simpletest.py @@ -53,4 +53,4 @@ pin0.value = False time.sleep(0.5) # Read pin 1 and print its state. - print("Pin 1 is at a high level: {0}".format(pin1.value)) + print(f"Pin 1 is at a high level: {pin1.value}") diff --git a/examples/mcp23Sxx_event_detect_interrupt.py b/examples/mcp23Sxx_event_detect_interrupt.py index 643f729..55e9fe4 100644 --- a/examples/mcp23Sxx_event_detect_interrupt.py +++ b/examples/mcp23Sxx_event_detect_interrupt.py @@ -9,6 +9,7 @@ import busio from digitalio import DigitalInOut, Direction, Pull from RPi import GPIO + from adafruit_mcp230xx.mcp23s17 import MCP23S17 # Initialize the SPI bus: @@ -49,8 +50,8 @@ def print_interrupt(port): """Callback function to be called when an Interrupt occurs.""" for pin_flag in mcp.int_flag: - print("Interrupt connected to Pin: {}".format(port)) - print("Pin number: {} changed to: {}".format(pin_flag, pins[pin_flag].value)) + print(f"Interrupt connected to Pin: {port}") + print(f"Pin number: {pin_flag} changed to: {pins[pin_flag].value}") mcp.clear_ints() diff --git a/examples/mcp23Sxx_simpletest.py b/examples/mcp23Sxx_simpletest.py index 94312ac..243290d 100644 --- a/examples/mcp23Sxx_simpletest.py +++ b/examples/mcp23Sxx_simpletest.py @@ -55,4 +55,4 @@ pin0.value = False time.sleep(0.5) # Read pin 1 and print its state. - print("Pin 1 is at a high level: {0}".format(pin1.value)) + print(f"Pin 1 is at a high level: {pin1.value}") diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..36332ff --- /dev/null +++ b/ruff.toml @@ -0,0 +1,105 @@ +# 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 +] + +[format] +line-ending = "lf"