From 4205f682f7964a8e49edc0e29e8aa2671dd01f6b Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 15 May 2025 21:17:04 +0000 Subject: [PATCH] change to ruff --- .gitattributes | 11 + .pre-commit-config.yaml | 43 +- .pylintrc | 399 ------------------ README.rst | 6 +- .../accelerometer_service.py | 3 +- adafruit_ble_adafruit/adafruit_service.py | 16 +- .../addressable_pixel_service.py | 6 +- .../barometric_pressure_service.py | 5 +- adafruit_ble_adafruit/button_service.py | 2 + adafruit_ble_adafruit/color_sensor_service.py | 3 +- adafruit_ble_adafruit/gesture_service.py | 6 +- adafruit_ble_adafruit/gyroscope_service.py | 3 +- adafruit_ble_adafruit/humidity_service.py | 3 +- adafruit_ble_adafruit/light_sensor_service.py | 3 +- adafruit_ble_adafruit/magnetometer_service.py | 3 +- adafruit_ble_adafruit/microphone_service.py | 3 +- adafruit_ble_adafruit/proximity_service.py | 4 +- adafruit_ble_adafruit/quaternion_service.py | 3 +- adafruit_ble_adafruit/temperature_service.py | 3 +- adafruit_ble_adafruit/tone_service.py | 2 +- docs/api.rst | 3 + docs/conf.py | 8 +- ...le_adafruit_circuitplayground_bluefruit.py | 11 +- examples/ble_adafruit_clue.py | 17 +- .../ble_adafruit_feather_bluefruit_sense.py | 22 +- examples/ble_adafruit_simpletest.py | 7 +- examples/ble_adafruit_simpletest_client.py | 3 +- ruff.toml | 108 +++++ 28 files changed, 200 insertions(+), 506 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 d535f57..ac55228 100644 --- a/README.rst +++ b/README.rst @@ -13,9 +13,9 @@ Introduction :target: https://github.com/adafruit/Adafruit_CircuitPython_ble_adafruit/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 BLE Adafruit Service diff --git a/adafruit_ble_adafruit/accelerometer_service.py b/adafruit_ble_adafruit/accelerometer_service.py index 835e691..b394c79 100644 --- a/adafruit_ble_adafruit/accelerometer_service.py +++ b/adafruit_ble_adafruit/accelerometer_service.py @@ -16,10 +16,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, StructCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class AccelerometerService(AdafruitService): # pylint: disable=too-few-public-methods +class AccelerometerService(AdafruitService): """Accelerometer values.""" uuid = AdafruitService.adafruit_service_uuid(0x200) diff --git a/adafruit_ble_adafruit/adafruit_service.py b/adafruit_ble_adafruit/adafruit_service.py index 443817d..9fa5795 100644 --- a/adafruit_ble_adafruit/adafruit_service.py +++ b/adafruit_ble_adafruit/adafruit_service.py @@ -29,22 +29,22 @@ import struct -from micropython import const - from adafruit_ble.advertising import Advertisement, LazyObjectField -from adafruit_ble.advertising.standard import ManufacturerData, ManufacturerDataField from adafruit_ble.advertising.adafruit import ( - MANUFACTURING_DATA_ADT, ADAFRUIT_COMPANY_ID, + MANUFACTURING_DATA_ADT, ) +from adafruit_ble.advertising.standard import ManufacturerData, ManufacturerDataField from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.int import Int32Characteristic, Uint32Characteristic -from adafruit_ble.uuid import VendorUUID from adafruit_ble.services import Service +from adafruit_ble.uuid import VendorUUID +from micropython import const try: from typing import Optional + from _bleio import ScanEntry except ImportError: pass @@ -53,9 +53,7 @@ _PID_DATA_ID = const(0x0001) # This is the same as the Radio data id, unfortunately. -class AdafruitServerAdvertisement( - Advertisement -): # pylint: disable=too-few-public-methods +class AdafruitServerAdvertisement(Advertisement): """Advertise the Adafruit company ID and the board USB PID.""" match_prefixes = ( @@ -96,7 +94,7 @@ def adafruit_service_uuid(n: int) -> VendorUUID: """Generate a VendorUUID which fills in a 16-bit value in the standard Adafruit Service UUID: ADAFnnnn-C332-42A8-93BD-25E905756CB8. """ - return VendorUUID("ADAF{:04x}-C332-42A8-93BD-25E905756CB8".format(n)) + return VendorUUID(f"ADAF{n:04x}-C332-42A8-93BD-25E905756CB8") @classmethod def measurement_period_charac(cls, msecs: int = 1000) -> Int32Characteristic: diff --git a/adafruit_ble_adafruit/addressable_pixel_service.py b/adafruit_ble_adafruit/addressable_pixel_service.py index 2605663..bf24c50 100644 --- a/adafruit_ble_adafruit/addressable_pixel_service.py +++ b/adafruit_ble_adafruit/addressable_pixel_service.py @@ -14,14 +14,14 @@ __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_Adafruit.git" -from collections import namedtuple import struct +from collections import namedtuple import _bleio - from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, ComplexCharacteristic from adafruit_ble.characteristics.int import Uint8Characteristic, Uint16Characteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService try: @@ -113,7 +113,7 @@ def values(self) -> Optional[PixelValues]: different parts of ``_pixel_packet``. """ buf = self._pixel_packet_buf - num_read = self._pixel_packet.readinto(buf) # pylint: disable=no-member + num_read = self._pixel_packet.readinto(buf) if num_read == 0: # No new values available return None diff --git a/adafruit_ble_adafruit/barometric_pressure_service.py b/adafruit_ble_adafruit/barometric_pressure_service.py index 692d8e0..ad21385 100644 --- a/adafruit_ble_adafruit/barometric_pressure_service.py +++ b/adafruit_ble_adafruit/barometric_pressure_service.py @@ -17,12 +17,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.float import FloatCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class BarometricPressureService( - AdafruitService -): # pylint: disable=too-few-public-methods +class BarometricPressureService(AdafruitService): """Barometric pressure value.""" uuid = AdafruitService.adafruit_service_uuid(0x800) diff --git a/adafruit_ble_adafruit/button_service.py b/adafruit_ble_adafruit/button_service.py index 16f7882..b324ba3 100644 --- a/adafruit_ble_adafruit/button_service.py +++ b/adafruit_ble_adafruit/button_service.py @@ -10,12 +10,14 @@ * Author(s): Dan Halbert """ + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_Adafruit.git" from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.int import Uint32Characteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService diff --git a/adafruit_ble_adafruit/color_sensor_service.py b/adafruit_ble_adafruit/color_sensor_service.py index 937d8d9..6c36016 100644 --- a/adafruit_ble_adafruit/color_sensor_service.py +++ b/adafruit_ble_adafruit/color_sensor_service.py @@ -16,10 +16,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, StructCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class ColorSensorService(AdafruitService): # pylint: disable=too-few-public-methods +class ColorSensorService(AdafruitService): """Color sensor value.""" uuid = AdafruitService.adafruit_service_uuid(0xA00) diff --git a/adafruit_ble_adafruit/gesture_service.py b/adafruit_ble_adafruit/gesture_service.py index 3267b2a..69d0b62 100644 --- a/adafruit_ble_adafruit/gesture_service.py +++ b/adafruit_ble_adafruit/gesture_service.py @@ -10,19 +10,21 @@ * Author(s): Dan Halbert """ + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_Adafruit.git" from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.int import Uint8Characteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class GestureService(AdafruitService): # pylint: disable=too-few-public-methods +class GestureService(AdafruitService): """Gesture sensor.""" - UP = 1 # pylint: disable=invalid-name + UP = 1 """swipe up""" DOWN = 2 """swipe down""" diff --git a/adafruit_ble_adafruit/gyroscope_service.py b/adafruit_ble_adafruit/gyroscope_service.py index 5e2996c..b691b20 100644 --- a/adafruit_ble_adafruit/gyroscope_service.py +++ b/adafruit_ble_adafruit/gyroscope_service.py @@ -16,10 +16,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, StructCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class GyroscopeService(AdafruitService): # pylint: disable=too-few-public-methods +class GyroscopeService(AdafruitService): """Gyroscope values.""" uuid = AdafruitService.adafruit_service_uuid(0x400) diff --git a/adafruit_ble_adafruit/humidity_service.py b/adafruit_ble_adafruit/humidity_service.py index a7339b0..30f7c4d 100644 --- a/adafruit_ble_adafruit/humidity_service.py +++ b/adafruit_ble_adafruit/humidity_service.py @@ -18,10 +18,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.float import FloatCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class HumidityService(AdafruitService): # pylint: disable=too-few-public-methods +class HumidityService(AdafruitService): """Humidity sensor value.""" uuid = AdafruitService.adafruit_service_uuid(0x700) diff --git a/adafruit_ble_adafruit/light_sensor_service.py b/adafruit_ble_adafruit/light_sensor_service.py index 7a384f3..b052d7e 100644 --- a/adafruit_ble_adafruit/light_sensor_service.py +++ b/adafruit_ble_adafruit/light_sensor_service.py @@ -17,10 +17,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.float import FloatCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class LightSensorService(AdafruitService): # pylint: disable=too-few-public-methods +class LightSensorService(AdafruitService): """Light sensor value.""" uuid = AdafruitService.adafruit_service_uuid(0x300) diff --git a/adafruit_ble_adafruit/magnetometer_service.py b/adafruit_ble_adafruit/magnetometer_service.py index 8ba324e..54863f3 100644 --- a/adafruit_ble_adafruit/magnetometer_service.py +++ b/adafruit_ble_adafruit/magnetometer_service.py @@ -16,10 +16,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, StructCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class MagnetometerService(AdafruitService): # pylint: disable=too-few-public-methods +class MagnetometerService(AdafruitService): """Magnetometer values.""" uuid = AdafruitService.adafruit_service_uuid(0x500) diff --git a/adafruit_ble_adafruit/microphone_service.py b/adafruit_ble_adafruit/microphone_service.py index 0f18b80..36112d2 100644 --- a/adafruit_ble_adafruit/microphone_service.py +++ b/adafruit_ble_adafruit/microphone_service.py @@ -17,10 +17,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.int import Uint8Characteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class MicrophoneService(AdafruitService): # pylint: disable=too-few-public-methods +class MicrophoneService(AdafruitService): """Digital microphone data.""" uuid = AdafruitService.adafruit_service_uuid(0xB00) diff --git a/adafruit_ble_adafruit/proximity_service.py b/adafruit_ble_adafruit/proximity_service.py index 2bcff90..1f7b8fa 100644 --- a/adafruit_ble_adafruit/proximity_service.py +++ b/adafruit_ble_adafruit/proximity_service.py @@ -10,16 +10,18 @@ * Author(s): Dan Halbert """ + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_Adafruit.git" from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.int import Uint16Characteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class ProximityService(AdafruitService): # pylint: disable=too-few-public-methods +class ProximityService(AdafruitService): """Status of buttons and switches on the board.""" uuid = AdafruitService.adafruit_service_uuid(0xE00) diff --git a/adafruit_ble_adafruit/quaternion_service.py b/adafruit_ble_adafruit/quaternion_service.py index 5db4b74..4d60347 100644 --- a/adafruit_ble_adafruit/quaternion_service.py +++ b/adafruit_ble_adafruit/quaternion_service.py @@ -16,10 +16,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, StructCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class QuaternionService(AdafruitService): # pylint: disable=too-few-public-methods +class QuaternionService(AdafruitService): """Quaternion values.""" uuid = AdafruitService.adafruit_service_uuid(0xD00) diff --git a/adafruit_ble_adafruit/temperature_service.py b/adafruit_ble_adafruit/temperature_service.py index 2dd2e8b..38c1e21 100644 --- a/adafruit_ble_adafruit/temperature_service.py +++ b/adafruit_ble_adafruit/temperature_service.py @@ -17,10 +17,11 @@ from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic from adafruit_ble.characteristics.float import FloatCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService -class TemperatureService(AdafruitService): # pylint: disable=too-few-public-methods +class TemperatureService(AdafruitService): """Temperature sensor.""" uuid = AdafruitService.adafruit_service_uuid(0x100) diff --git a/adafruit_ble_adafruit/tone_service.py b/adafruit_ble_adafruit/tone_service.py index 69b506e..5fcc68d 100644 --- a/adafruit_ble_adafruit/tone_service.py +++ b/adafruit_ble_adafruit/tone_service.py @@ -17,9 +17,9 @@ import struct from _bleio import PacketBuffer - from adafruit_ble.attributes import Attribute from adafruit_ble.characteristics import Characteristic, ComplexCharacteristic + from adafruit_ble_adafruit.adafruit_service import AdafruitService try: diff --git a/docs/api.rst b/docs/api.rst index ca28000..fc1cd7a 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -1,5 +1,8 @@ .. If you created a package, create one automodule per module in the package. +API Reference +############# + .. automodule:: adafruit_ble_adafruit.accelerometer_service :members: diff --git a/docs/conf.py b/docs/conf.py index e0210b1..5bfcae7 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("..")) @@ -47,9 +45,7 @@ creation_year = "2020" 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 + " Adafruit Industries" author = "Adafruit Industries" diff --git a/examples/ble_adafruit_circuitplayground_bluefruit.py b/examples/ble_adafruit_circuitplayground_bluefruit.py index 5ebba5d..6d8918d 100644 --- a/examples/ble_adafruit_circuitplayground_bluefruit.py +++ b/examples/ble_adafruit_circuitplayground_bluefruit.py @@ -7,16 +7,13 @@ import time import board -from digitalio import DigitalInOut import neopixel_write - from adafruit_ble import BLERadio - from adafruit_circuitplayground import cp - -from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement +from digitalio import DigitalInOut from adafruit_ble_adafruit.accelerometer_service import AccelerometerService +from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement from adafruit_ble_adafruit.addressable_pixel_service import AddressablePixelService from adafruit_ble_adafruit.button_service import ButtonService from adafruit_ble_adafruit.light_sensor_service import LightSensorService @@ -32,7 +29,7 @@ neopixel_svc = AddressablePixelService() neopixel_buf = bytearray(NEOPIXEL_BUF_LENGTH) # Take over NeoPixel control from cp. -cp._pixels.deinit() # pylint: disable=protected-access +cp._pixels.deinit() neopixel_out = DigitalInOut(board.NEOPIXEL) neopixel_out.switch_to_output() @@ -69,7 +66,7 @@ ble.stop_advertising() while ble.connected: - now_msecs = time.monotonic_ns() // 1000000 # pylint: disable=no-member + now_msecs = time.monotonic_ns() // 1000000 if now_msecs - accel_last_update >= accel_svc.measurement_period: accel_svc.acceleration = cp.acceleration diff --git a/examples/ble_adafruit_clue.py b/examples/ble_adafruit_clue.py index 9c65203..a4ee696 100644 --- a/examples/ble_adafruit_clue.py +++ b/examples/ble_adafruit_clue.py @@ -7,17 +7,14 @@ import time import board -from digitalio import DigitalInOut import neopixel_write from adafruit_ble import BLERadio - -from ulab import numpy as np - from adafruit_clue import clue - -from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement +from digitalio import DigitalInOut +from ulab import numpy as np from adafruit_ble_adafruit.accelerometer_service import AccelerometerService +from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement from adafruit_ble_adafruit.addressable_pixel_service import AddressablePixelService from adafruit_ble_adafruit.barometric_pressure_service import BarometricPressureService from adafruit_ble_adafruit.button_service import ButtonService @@ -36,7 +33,7 @@ neopixel_svc = AddressablePixelService() neopixel_buf = bytearray(NEOPIXEL_BUF_LENGTH) # Take over NeoPixel control from clue. -clue._pixel.deinit() # pylint: disable=protected-access +clue._pixel.deinit() neopixel_out = DigitalInOut(board.NEOPIXEL) neopixel_out.switch_to_output() @@ -89,7 +86,7 @@ ble.stop_advertising() while ble.connected: - now_msecs = time.monotonic_ns() // 1000000 # pylint: disable=no-member + now_msecs = time.monotonic_ns() // 1000000 if now_msecs - accel_last_update >= accel_svc.measurement_period: accel_svc.acceleration = clue.acceleration @@ -111,9 +108,7 @@ light_last_update = now_msecs if now_msecs - mic_last_update >= mic_svc.measurement_period: - clue._mic.record( # pylint: disable=protected-access - mic_samples, len(mic_samples) - ) + clue._mic.record(mic_samples, len(mic_samples)) # Need to create an array of the correct type, because ulab # seems to get broadcasting of builtin Python types wrong. offset = np.array([32768], dtype=np.uint16) diff --git a/examples/ble_adafruit_feather_bluefruit_sense.py b/examples/ble_adafruit_feather_bluefruit_sense.py index 9779d80..1923cb1 100644 --- a/examples/ble_adafruit_feather_bluefruit_sense.py +++ b/examples/ble_adafruit_feather_bluefruit_sense.py @@ -7,25 +7,19 @@ import time -import board - -import digitalio -import neopixel_write - -from ulab import numpy as np - -from adafruit_ble import BLERadio - -import audiobusio - import adafruit_apds9960.apds9960 import adafruit_bmp280 import adafruit_lsm6ds.lsm6ds33 import adafruit_sht31d - -from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement +import audiobusio +import board +import digitalio +import neopixel_write +from adafruit_ble import BLERadio +from ulab import numpy as np from adafruit_ble_adafruit.accelerometer_service import AccelerometerService +from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement from adafruit_ble_adafruit.addressable_pixel_service import AddressablePixelService from adafruit_ble_adafruit.barometric_pressure_service import BarometricPressureService from adafruit_ble_adafruit.button_service import ButtonService @@ -114,7 +108,7 @@ ble.stop_advertising() while ble.connected: - now_msecs = time.monotonic_ns() // 1000000 # pylint: disable=no-member + now_msecs = time.monotonic_ns() // 1000000 if now_msecs - accel_last_update >= accel_svc.measurement_period: accel_svc.acceleration = lsm6ds33.acceleration diff --git a/examples/ble_adafruit_simpletest.py b/examples/ble_adafruit_simpletest.py index 88972c7..bce1388 100644 --- a/examples/ble_adafruit_simpletest.py +++ b/examples/ble_adafruit_simpletest.py @@ -6,7 +6,6 @@ import time import microcontroller - from adafruit_ble import BLERadio from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement @@ -32,11 +31,9 @@ ble.stop_advertising() while ble.connected: - now_msecs = time.monotonic_ns() // 1000000 # pylint: disable=no-member + now_msecs = time.monotonic_ns() // 1000000 if now_msecs - temp_last_update >= temp_svc.measurement_period: - temp_svc.temperature = ( - microcontroller.cpu.temperature # pylint: disable=no-member - ) + temp_svc.temperature = microcontroller.cpu.temperature temp_last_update = now_msecs diff --git a/examples/ble_adafruit_simpletest_client.py b/examples/ble_adafruit_simpletest_client.py index d10dbfa..915f3d1 100644 --- a/examples/ble_adafruit_simpletest_client.py +++ b/examples/ble_adafruit_simpletest_client.py @@ -4,11 +4,12 @@ import time import adafruit_ble + from adafruit_ble_adafruit.adafruit_service import AdafruitServerAdvertisement from adafruit_ble_adafruit.temperature_service import TemperatureService # PyLint can't find BLERadio for some reason so special case it here. -ble = adafruit_ble.BLERadio() # pylint: disable=no-member +ble = adafruit_ble.BLERadio() connection = None diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..73e9efc --- /dev/null +++ b/ruff.toml @@ -0,0 +1,108 @@ +# 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 + "PLC2701", # private import +] + +[format] +line-ending = "lf"