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 45eefe0..d1fb669 100644 --- a/README.rst +++ b/README.rst @@ -14,9 +14,9 @@ Introduction :target: https://github.com/adafruit/Adafruit_CircuitPython_Motor/actions/ :alt: Build Status -.. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code Style: Black +.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json + :target: https://github.com/astral-sh/ruff + :alt: Code Style: Ruff This helper library provides higher level objects to control motors and servos based on one or more PWM outputs. diff --git a/adafruit_motor/motor.py b/adafruit_motor/motor.py index d2231b5..7086bb6 100644 --- a/adafruit_motor/motor.py +++ b/adafruit_motor/motor.py @@ -21,8 +21,8 @@ """ try: - from typing import Optional, Type from types import TracebackType + from typing import Optional, Type try: from pwmio import PWMOut @@ -94,13 +94,12 @@ def throttle(self, value: Optional[float]) -> None: else: self._positive.duty_cycle = 0xFFFF self._negative.duty_cycle = 0xFFFF - duty_cycle - else: # Default Fast Decay (Coasting) Mode - if value < 0: - self._positive.duty_cycle = 0 - self._negative.duty_cycle = duty_cycle - else: - self._positive.duty_cycle = duty_cycle - self._negative.duty_cycle = 0 + elif value < 0: + self._positive.duty_cycle = 0 + self._negative.duty_cycle = duty_cycle + else: + self._positive.duty_cycle = duty_cycle + self._negative.duty_cycle = 0 @property def decay_mode(self) -> int: @@ -111,12 +110,10 @@ def decay_mode(self) -> int: @decay_mode.setter def decay_mode(self, mode: int = FAST_DECAY) -> None: - if mode in (FAST_DECAY, SLOW_DECAY): + if mode in {FAST_DECAY, SLOW_DECAY}: self._decay_mode = mode else: - raise ValueError( - "Decay mode value must be either motor.FAST_DECAY or motor.SLOW_DECAY" - ) + raise ValueError("Decay mode value must be either motor.FAST_DECAY or motor.SLOW_DECAY") def __enter__(self) -> "DCMotor": return self diff --git a/adafruit_motor/servo.py b/adafruit_motor/servo.py index 752da8a..ae8ffc0 100644 --- a/adafruit_motor/servo.py +++ b/adafruit_motor/servo.py @@ -13,10 +13,9 @@ """ try: - from typing import Optional, Type from types import TracebackType + from typing import Optional, Type - # pylint: disable-msg=unused-import try: from pwmio import PWMOut except NotImplementedError: @@ -32,22 +31,18 @@ # We disable the too few public methods check because this is a private base class for the two types # of servos. -class _BaseServo: # pylint: disable-msg=too-few-public-methods +class _BaseServo: """Shared base class that handles pulse output based on a value between 0 and 1.0 :param ~pwmio.PWMOut pwm_out: PWM output object. :param int min_pulse: The minimum pulse length of the servo in microseconds. :param int max_pulse: The maximum pulse length of the servo in microseconds.""" - def __init__( - self, pwm_out: "PWMOut", *, min_pulse: int = 750, max_pulse: int = 2250 - ) -> None: + def __init__(self, pwm_out: "PWMOut", *, min_pulse: int = 750, max_pulse: int = 2250) -> None: self._pwm_out = pwm_out self.set_pulse_width_range(min_pulse, max_pulse) - def set_pulse_width_range( - self, min_pulse: int = 750, max_pulse: int = 2250 - ) -> None: + def set_pulse_width_range(self, min_pulse: int = 750, max_pulse: int = 2250) -> None: """Change min and max pulse widths.""" self._min_duty = int((min_pulse * self._pwm_out.frequency) / 1000000 * 0xFFFF) max_duty = (max_pulse * self._pwm_out.frequency) / 1000000 * 0xFFFF @@ -110,7 +105,7 @@ def __init__( *, actuation_range: int = 180, min_pulse: int = 750, - max_pulse: int = 2250 + max_pulse: int = 2250, ) -> None: super().__init__(pwm_out, min_pulse=min_pulse, max_pulse=max_pulse) self.actuation_range = actuation_range diff --git a/adafruit_motor/stepper.py b/adafruit_motor/stepper.py index 3100d34..f2c85de 100755 --- a/adafruit_motor/stepper.py +++ b/adafruit_motor/stepper.py @@ -19,7 +19,8 @@ from micropython import const try: - from typing import Union, Optional + from typing import Optional, Union + from digitalio import DigitalInOut try: @@ -56,9 +57,7 @@ _DOUBLE_STEPS = bytes([0b1010, 0b0110, 0b0101, 0b1001]) -_INTERLEAVE_STEPS = bytes( - [0b1010, 0b0010, 0b0110, 0b0100, 0b0101, 0b0001, 0b1001, 0b1000] -) +_INTERLEAVE_STEPS = bytes([0b1010, 0b0010, 0b0110, 0b0100, 0b0101, 0b0001, 0b1001, 0b1000]) class StepperMotor: @@ -98,7 +97,7 @@ def __init__( bin1: Union[PWMOut, DigitalInOut], bin2: Union[PWMOut, DigitalInOut], *, - microsteps: Optional[int] = 16 + microsteps: Optional[int] = 16, ) -> None: if microsteps is None: # @@ -179,9 +178,7 @@ def release(self) -> None: else: coil.duty_cycle = 0 - def onestep( # pylint: disable=too-many-branches - self, *, direction: int = FORWARD, style: int = SINGLE - ) -> None: + def onestep(self, *, direction: int = FORWARD, style: int = SINGLE) -> None: """Performs one step of a particular style. The actual rotation amount will vary by style. `SINGLE` and `DOUBLE` will normal cause a full step rotation. `INTERLEAVE` will normally do a half step rotation. `MICROSTEP` will perform the smallest configured step. @@ -234,7 +231,7 @@ def onestep( # pylint: disable=too-many-branches style == DOUBLE and current_interleave % 2 == 0 ): step_size = half_step - elif style in (SINGLE, DOUBLE): + elif style in {SINGLE, DOUBLE}: step_size = full_step if direction == FORWARD: diff --git a/docs/api.rst b/docs/api.rst index dae87a1..6d3af73 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -1,6 +1,12 @@ .. If you created a package, create one automodule per module in the package. +.. 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_motor.motor :members: diff --git a/docs/conf.py b/docs/conf.py index d1e5cc6..3a61b6c 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("..")) @@ -45,9 +43,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 + " Scott Shawcroft" author = "Scott Shawcroft" diff --git a/examples/motor_h-bridge_dc_motor.py b/examples/motor_h-bridge_dc_motor.py index d15e38f..c393a76 100644 --- a/examples/motor_h-bridge_dc_motor.py +++ b/examples/motor_h-bridge_dc_motor.py @@ -9,8 +9,10 @@ # e.g., RP2040 Pico pins GP28, GP27 import time + import board import pwmio + from adafruit_motor import motor PWM_PIN_A = board.GP28 # pick any pwm pins on their own channels diff --git a/examples/motor_pca9685_continuous_servo.py b/examples/motor_pca9685_continuous_servo.py index 792a76a..a8d423a 100644 --- a/examples/motor_pca9685_continuous_servo.py +++ b/examples/motor_pca9685_continuous_servo.py @@ -3,12 +3,12 @@ import time -from board import SCL, SDA import busio # Import the PCA9685 module. Available in the bundle and here: # https://github.com/adafruit/Adafruit_CircuitPython_PCA9685 from adafruit_pca9685 import PCA9685 +from board import SCL, SDA from adafruit_motor import servo diff --git a/examples/motor_pca9685_dc_motor.py b/examples/motor_pca9685_dc_motor.py index 17e34bb..453d791 100644 --- a/examples/motor_pca9685_dc_motor.py +++ b/examples/motor_pca9685_dc_motor.py @@ -6,12 +6,12 @@ import time -from board import SCL, SDA import busio # Import the PCA9685 module. Available in the bundle and here: # https://github.com/adafruit/Adafruit_CircuitPython_PCA9685 from adafruit_pca9685 import PCA9685 +from board import SCL, SDA from adafruit_motor import motor @@ -32,9 +32,7 @@ # See here for more info: https://learn.adafruit.com/adafruit-motor-shield-v2-for-arduino/faq#faq-13 pca.channels[7].duty_cycle = 0xFFFF motor4 = motor.DCMotor(pca.channels[5], pca.channels[6]) -motor4.decay_mode = ( - motor.SLOW_DECAY -) # Set motor to active braking mode to improve performance +motor4.decay_mode = motor.SLOW_DECAY # Set motor to active braking mode to improve performance print("Forwards slow") motor4.throttle = 0.5 diff --git a/examples/motor_pca9685_servo_sweep.py b/examples/motor_pca9685_servo_sweep.py index 7abcf9c..eaba6c9 100644 --- a/examples/motor_pca9685_servo_sweep.py +++ b/examples/motor_pca9685_servo_sweep.py @@ -3,12 +3,13 @@ import time -from board import SCL, SDA import busio # Import the PCA9685 module. Available in the bundle and here: # https://github.com/adafruit/Adafruit_CircuitPython_PCA9685 from adafruit_pca9685 import PCA9685 +from board import SCL, SDA + from adafruit_motor import servo i2c = busio.I2C(SCL, SDA) diff --git a/examples/motor_pca9685_stepper_motor.py b/examples/motor_pca9685_stepper_motor.py index 514eeaa..0e1f232 100644 --- a/examples/motor_pca9685_stepper_motor.py +++ b/examples/motor_pca9685_stepper_motor.py @@ -6,12 +6,12 @@ import time -from board import SCL, SDA import busio # Import the PCA9685 module. Available in the bundle and here: # https://github.com/adafruit/Adafruit_CircuitPython_PCA9685 from adafruit_pca9685 import PCA9685 +from board import SCL, SDA from adafruit_motor import stepper diff --git a/examples/motor_servo_sweep_simpletest.py b/examples/motor_servo_sweep_simpletest.py index 4cd684c..09d127b 100644 --- a/examples/motor_servo_sweep_simpletest.py +++ b/examples/motor_servo_sweep_simpletest.py @@ -2,8 +2,10 @@ # SPDX-License-Identifier: MIT import time + import board import pwmio + from adafruit_motor import servo # create a PWMOut object on the control pin. diff --git a/examples/motor_stepper_digitalio.py b/examples/motor_stepper_digitalio.py index 35b7e27..8e9dce3 100755 --- a/examples/motor_stepper_digitalio.py +++ b/examples/motor_stepper_digitalio.py @@ -5,8 +5,10 @@ # like a DRV8833, TB6612 or L298N. import time + import board import digitalio + from adafruit_motor import stepper DELAY = 0.01 diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..d7684a2 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,109 @@ +# 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 + "PLR1714", # consider multiple compare +] + +[format] +line-ending = "lf" diff --git a/tests/test_stepper.py b/tests/test_stepper.py index 73c312a..bf78eca 100644 --- a/tests/test_stepper.py +++ b/tests/test_stepper.py @@ -20,13 +20,11 @@ # Fix up the path to include our neighboring module. sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) -micropython = MagicMock() # pylint: disable-msg=invalid-name +micropython = MagicMock() micropython.const = lambda x: x sys.modules["micropython"] = micropython -from adafruit_motor import stepper # pylint: disable-msg=wrong-import-position - -# pylint: disable=consider-using-in +from adafruit_motor import stepper class Coil: @@ -76,9 +74,7 @@ def test_double_coil(): for i in range(6): # Test 6 steps so we wrap around motor.onestep(style=stepper.DOUBLE) for j in range(4): - assert coil[j].duty_cycle == ( - 0xFFFF if i % 4 == j or (i + 1) % 4 == j else 0 - ) + assert coil[j].duty_cycle == (0xFFFF if i % 4 == j or (i + 1) % 4 == j else 0) def test_interleave_steps():