From 53652e0e9f6fdfb459de8a64788314e2dfa5edb7 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 15 May 2025 19:59:59 +0000 Subject: [PATCH] change to ruff --- .gitattributes | 11 + .pre-commit-config.yaml | 43 +-- .pylintrc | 399 --------------------------- README.rst | 6 +- asyncio/core.py | 11 +- asyncio/funcs.py | 14 +- asyncio/lock.py | 1 + asyncio/stream.py | 3 +- asyncio/traceback.py | 4 +- docs/api.rst | 3 + docs/conf.py | 8 +- examples/asyncio_displayio_button.py | 37 +-- examples/asyncio_event_example.py | 5 +- examples/asyncio_serial_examples.py | 3 +- examples/asyncio_simpletest.py | 3 +- examples/asyncio_usb_cdc_boot.py | 1 + ruff.toml | 111 ++++++++ 17 files changed, 177 insertions(+), 486 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 874bf5f..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: v3.2.6 + - 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 28ceeb5..027c90b 100644 --- a/README.rst +++ b/README.rst @@ -17,9 +17,9 @@ Introduction :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 Cooperative multitasking and asynchronous I/O diff --git a/asyncio/core.py b/asyncio/core.py index 1024ad2..e799170 100644 --- a/asyncio/core.py +++ b/asyncio/core.py @@ -14,8 +14,11 @@ # fmt: off # CIRCUITPY-CHANGE: use our ticks library -from adafruit_ticks import ticks_ms as ticks, ticks_diff, ticks_add -import sys, select +import select +import sys + +from adafruit_ticks import ticks_add, ticks_diff +from adafruit_ticks import ticks_ms as ticks # CIRCUITPY-CHANGE: CircuitPython traceback support try: @@ -25,10 +28,10 @@ # Import TaskQueue and Task, preferring built-in C code over Python code try: - from _asyncio import TaskQueue, Task + from _asyncio import Task, TaskQueue # CIRCUITPY-CHANGE: more specific error checking except ImportError: - from .task import TaskQueue, Task + from .task import Task, TaskQueue ################################################################################ # Exceptions diff --git a/asyncio/funcs.py b/asyncio/funcs.py index 566b32c..b3b7068 100644 --- a/asyncio/funcs.py +++ b/asyncio/funcs.py @@ -168,14 +168,12 @@ def done(t, er): elif isinstance(ts[i].data, StopIteration): # Sub-task ran to completion, get its return value. ts[i] = ts[i].data.value - else: - # Sub-task had an exception. - if return_exceptions: - # Get the sub-task exception to return in the list of return values. - ts[i] = ts[i].data - elif isinstance(state, int): - # Raise the sub-task exception, if there is not already an exception to raise. - state = ts[i].data + elif return_exceptions: + # Get the sub-task exception to return in the list of return values. + ts[i] = ts[i].data + elif isinstance(state, int): + # Raise the sub-task exception, if there is not already an exception to raise. + state = ts[i].data # Either this gather was cancelled, or one of the sub-tasks raised an exception with # return_exceptions==False, so reraise the exception here. diff --git a/asyncio/lock.py b/asyncio/lock.py index 034d2f6..92b0115 100644 --- a/asyncio/lock.py +++ b/asyncio/lock.py @@ -19,6 +19,7 @@ from . import core + # Lock class for primitive mutex capability class Lock: # CIRCUITPY-CHANGE: doc diff --git a/asyncio/stream.py b/asyncio/stream.py index 0d2e249..2211f81 100644 --- a/asyncio/stream.py +++ b/asyncio/stream.py @@ -154,9 +154,10 @@ async def open_connection(host, port, ssl=None, server_hostname=None): ``OSError`` if the host could not be resolved or if the connection could not be made. """ - from uerrno import EINPROGRESS import socket + from uerrno import EINPROGRESS + ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0] # TODO this is blocking! s = socket.socket(ai[0], ai[1], ai[2]) s.setblocking(False) diff --git a/asyncio/traceback.py b/asyncio/traceback.py index 8e0386e..9c5bef1 100644 --- a/asyncio/traceback.py +++ b/asyncio/traceback.py @@ -27,7 +27,7 @@ def _print_traceback(traceback, limit=None, file=sys.stderr) -> List[str]: frame_code = frame.f_code filename = frame_code.co_filename name = frame_code.co_name - print(' File "%s", line %d, in %s' % (filename, line_number, name), file=file) + print(f' File "{filename}", line {line_number}, in {name}', file=file) traceback = traceback.tb_next n = n + 1 if limit is not None and n >= limit: @@ -53,4 +53,4 @@ def print_exception(exception, value=None, traceback=None, limit=None, file=sys. if value is None or not valuestr: print(exception_type, file=file) else: - print("%s: %s" % (str(exception_type), valuestr), file=file) + print(f"{str(exception_type)}: {valuestr}", file=file) diff --git a/docs/api.rst b/docs/api.rst index 2414146..c594760 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -5,6 +5,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:: asyncio :members: diff --git a/docs/conf.py b/docs/conf.py index 0150e43..c38ac82 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- - # SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries # # SPDX-License-Identifier: MIT +import datetime import os import sys -import datetime sys.path.insert(0, os.path.abspath("..")) @@ -51,9 +49,7 @@ creation_year = "2021" 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 + " Dan Halbert" author = "Dan Halbert" diff --git a/examples/asyncio_displayio_button.py b/examples/asyncio_displayio_button.py index 8221fe8..4ae10e3 100644 --- a/examples/asyncio_displayio_button.py +++ b/examples/asyncio_displayio_button.py @@ -8,11 +8,12 @@ """ import asyncio + import adafruit_touchscreen +import board import displayio import terminalio import vectorio -import board from adafruit_button import Button # use built-in display @@ -101,14 +102,12 @@ # Button state data object. Will hold either true of false whether button is currently pressed class ButtonState: - # pylint: disable=too-few-public-methods def __init__(self, initial_state): self.state = initial_state # Interval length data object. Holds the amount of time in ms the interval should last for class Interval: - # pylint: disable=too-few-public-methods def __init__(self, initial_value): self.value = initial_value @@ -202,13 +201,11 @@ def handle_color_button(touch_event, color_button, button_state): button_state.state = False # there are no touch events - else: - # if the color button is currently the pressed color - if color_button.selected: - # set selected back to false to change button back to default color - color_button.selected = False - # set button_state so other coroutines can access it - button_state.state = False + elif color_button.selected: + # set selected back to false to change button back to default color + color_button.selected = False + # set button_state so other coroutines can access it + button_state.state = False def handle_interval_buttons(touch_event, button_slower, button_faster, interval): @@ -233,7 +230,7 @@ def handle_interval_buttons(touch_event, button_slower, button_faster, interval) # increment the interval length and store it on the data object interval.value += 100 - print("new interval val: {}".format(interval.value)) + print(f"new interval val: {interval.value}") # if the slower button is not being touched else: @@ -250,7 +247,7 @@ def handle_interval_buttons(touch_event, button_slower, button_faster, interval) if interval.value >= 100: # decrement interval value and store it on the data object interval.value -= 100 - print("new interval val: {}".format(interval.value)) + print(f"new interval val: {interval.value}") # if the faster button is not being touched else: @@ -270,9 +267,7 @@ def handle_interval_buttons(touch_event, button_slower, button_faster, interval) button_faster.selected = False -async def monitor_buttons( - button_slower, button_faster, color_button, interval, button_state -): +async def monitor_buttons(button_slower, button_faster, color_button, interval, button_state): """ monitor_buttons coroutine. @@ -303,12 +298,8 @@ async def main(): # Don't forget the async! interval_2 = Interval(350) # create circle blink tasks - circle_1_task = asyncio.create_task( - blink(palette_1, interval_1, -1, color_btn_state) - ) - circle_2_task = asyncio.create_task( - blink(palette_2, interval_2, 20, color_btn_state) - ) + circle_1_task = asyncio.create_task(blink(palette_1, interval_1, -1, color_btn_state)) + circle_2_task = asyncio.create_task(blink(palette_2, interval_2, 20, color_btn_state)) # create buttons task button_task = asyncio.create_task( @@ -322,9 +313,7 @@ async def main(): # Don't forget the async! ) # start all of the tasks - await asyncio.gather( - circle_1_task, circle_2_task, button_task - ) # Don't forget the await! + await asyncio.gather(circle_1_task, circle_2_task, button_task) # Don't forget the await! # show main_group so it's visible on the display diff --git a/examples/asyncio_event_example.py b/examples/asyncio_event_example.py index 9998909..ef3df0e 100644 --- a/examples/asyncio_event_example.py +++ b/examples/asyncio_event_example.py @@ -11,11 +11,11 @@ # should be straightforward with changes to names and objects. import asyncio + import board import digitalio -from adafruit_debouncer import Debouncer import neopixel - +from adafruit_debouncer import Debouncer # Import library modules, as is tradition @@ -39,7 +39,6 @@ class Color: - # pylint: disable=too-few-public-methods def __init__(self, initial_value): self.value = initial_value diff --git a/examples/asyncio_serial_examples.py b/examples/asyncio_serial_examples.py index d342f33..bb55801 100644 --- a/examples/asyncio_serial_examples.py +++ b/examples/asyncio_serial_examples.py @@ -10,7 +10,6 @@ to the console. """ - import asyncio USE_USB = True @@ -51,7 +50,7 @@ async def ble_client(): uart = UARTService() advertisement = ProvideServicesAdvertisement(uart) ble.start_advertising(advertisement) - s = asyncio.StreamReader(uart._rx) # pylint: disable=protected-access + s = asyncio.StreamReader(uart._rx) while True: text = await s.read(6) print("BLE: ", text) diff --git a/examples/asyncio_simpletest.py b/examples/asyncio_simpletest.py index 693a13e..0d64245 100644 --- a/examples/asyncio_simpletest.py +++ b/examples/asyncio_simpletest.py @@ -5,6 +5,7 @@ # -----[Example for one led]----------------------------- import asyncio + import board import digitalio @@ -34,7 +35,6 @@ async def main(): # Don't forget the async! async def blink(pin, interval, count): - # pylint: disable=function-redefined with digitalio.DigitalInOut(pin) as led: led.switch_to_output(value=False) for _ in range(count): @@ -45,7 +45,6 @@ async def blink(pin, interval, count): async def main(): - # pylint: disable=function-redefined led1_task = asyncio.create_task(blink(board.D1, 0.25, 10)) led2_task = asyncio.create_task(blink(board.D2, 0.1, 20)) diff --git a/examples/asyncio_usb_cdc_boot.py b/examples/asyncio_usb_cdc_boot.py index 6cd5593..6ca511b 100644 --- a/examples/asyncio_usb_cdc_boot.py +++ b/examples/asyncio_usb_cdc_boot.py @@ -4,6 +4,7 @@ """ Save this file as boot.py on CIRCUITPY to enable the usb_cdc.data serial device """ + import usb_cdc usb_cdc.enable(data=True, console=True) diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..fb7b4b1 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,111 @@ +# 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 + "PLR6301", # could-be-static no-self-use + "PLC0415", # import outside toplevel + "E722", # bare except + "E501", # line length + "PLW0603", # global var + "PLW0602", # global var not re-assigned +] + +[format] +line-ending = "lf"