Skip to content

Commit 6043a1f

Browse files
committed
use ruff, correct homepage url in pyproject.toml
1 parent 7d59346 commit 6043a1f

25 files changed

+251
-207
lines changed

.gitattributes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
.py text eol=lf
6+
.rst text eol=lf
7+
.txt text eol=lf
8+
.yaml text eol=lf
9+
.toml text eol=lf
10+
.license text eol=lf
11+
.md text eol=lf

.pre-commit-config.yaml

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,21 @@
1-
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
1+
# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries
22
#
33
# SPDX-License-Identifier: Unlicense
44

55
repos:
6-
- repo: https://github.com/python/black
7-
rev: 23.3.0
8-
hooks:
9-
- id: black
10-
- repo: https://github.com/fsfe/reuse-tool
11-
rev: v1.1.2
12-
hooks:
13-
- id: reuse
146
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v4.4.0
7+
rev: v4.5.0
168
hooks:
179
- id: check-yaml
1810
- id: end-of-file-fixer
1911
- id: trailing-whitespace
20-
- repo: https://github.com/pycqa/pylint
21-
rev: v2.17.4
12+
- repo: https://github.com/astral-sh/ruff-pre-commit
13+
rev: v0.3.4
2214
hooks:
23-
- id: pylint
24-
name: pylint (library code)
25-
types: [python]
26-
args:
27-
- --disable=consider-using-f-string,duplicate-code
28-
exclude: "^(docs/|examples/|tests/|setup.py$)"
29-
- id: pylint
30-
name: pylint (example code)
31-
description: Run pylint rules on "examples/*.py" files
32-
types: [python]
33-
files: "^examples/"
34-
args:
35-
- --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code
36-
- id: pylint
37-
name: pylint (test code)
38-
description: Run pylint rules on "tests/*.py" files
39-
types: [python]
40-
files: "^tests/"
41-
args:
42-
- --disable=missing-docstring,consider-using-f-string,duplicate-code
15+
- id: ruff-format
16+
- id: ruff
17+
args: ["--fix"]
18+
- repo: https://github.com/fsfe/reuse-tool
19+
rev: v3.0.1
20+
hooks:
21+
- id: reuse

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Introduction
1313
:target: https://github.com/adafruit/Adafruit_CircuitPython_PyBadger/actions/
1414
:alt: Build Status
1515

16-
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
17-
:target: https://github.com/psf/black
18-
:alt: Code Style: Black
16+
.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
17+
:target: https://github.com/astral-sh/ruff
18+
:alt: Code Style: Ruff
1919

2020
Badge-focused CircuitPython helper library for PyBadge, PyBadge LC, PyGamer, CLUE, and Mag Tag.
2121

adafruit_pybadger/clue.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@
2626
"""
2727

2828
from collections import namedtuple
29-
import board
29+
30+
import adafruit_lsm6ds.lsm6ds3trc
31+
import adafruit_lsm6ds.lsm6ds33
3032
import audiopwmio
33+
import board
3134
import keypad
32-
import adafruit_lsm6ds.lsm6ds33
33-
import adafruit_lsm6ds.lsm6ds3trc
3435
import neopixel
35-
from adafruit_pybadger.pybadger_base import PyBadgerBase, KeyStates
36+
37+
from adafruit_pybadger.pybadger_base import KeyStates, PyBadgerBase
3638

3739
__version__ = "0.0.0+auto.0"
3840
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PyBadger.git"
@@ -84,9 +86,7 @@ def button(self) -> Buttons:
8486
print("Button B")
8587
"""
8688
self._buttons.update()
87-
button_values = tuple(
88-
self._buttons.was_pressed(i) for i in range(self._keys.key_count)
89-
)
89+
button_values = tuple(self._buttons.was_pressed(i) for i in range(self._keys.key_count))
9090
return Buttons(button_values[0], button_values[1])
9191

9292
@property
@@ -101,5 +101,5 @@ def _unsupported(self):
101101
light = _unsupported
102102

103103

104-
clue = Clue() # pylint: disable=invalid-name
104+
clue = Clue()
105105
"""Object that is automatically created on import."""

adafruit_pybadger/cpb_gizmo.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@
2727
"""
2828

2929
from collections import namedtuple
30-
import board
31-
import digitalio
30+
31+
import adafruit_lis3dh
3232
import analogio
33-
import busio
3433
import audiopwmio
34+
import board
35+
import busio
36+
import digitalio
3537
import keypad
36-
from adafruit_gizmo import tft_gizmo
37-
import adafruit_lis3dh
3838
import neopixel
39-
from adafruit_pybadger.pybadger_base import PyBadgerBase, KeyStates
39+
from adafruit_gizmo import tft_gizmo
4040

41+
from adafruit_pybadger.pybadger_base import KeyStates, PyBadgerBase
4142

4243
__version__ = "0.0.0+auto.0"
4344
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PyBadger.git"
@@ -91,9 +92,7 @@ def button(self) -> Buttons:
9192
print("Button B")
9293
"""
9394
self._buttons.update()
94-
button_values = tuple(
95-
self._buttons.was_pressed(i) for i in range(self._keys.key_count)
96-
)
95+
button_values = tuple(self._buttons.was_pressed(i) for i in range(self._keys.key_count))
9796
return Buttons(button_values[0], button_values[1])
9897

9998
@property
@@ -106,5 +105,5 @@ def _unsupported(self):
106105
# NotImplementedError raised in the property above.
107106

108107

109-
cpb_gizmo = CPB_Gizmo() # pylint: disable=invalid-name
108+
cpb_gizmo = CPB_Gizmo()
110109
"""Object that is automatically created on import."""

adafruit_pybadger/magtag.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
"""
2727

2828
from collections import namedtuple
29+
2930
import board
3031
import neopixel
31-
from adafruit_pybadger.pybadger_base import PyBadgerBase
3232

33+
from adafruit_pybadger.pybadger_base import PyBadgerBase
3334

3435
__version__ = "0.0.0+auto.0"
3536
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PyBadger.git"
@@ -81,5 +82,5 @@ def _unsupported(self):
8182
button = _unsupported
8283

8384

84-
magtag = MagTag() # pylint: disable=invalid-name
85+
magtag = MagTag()
8586
"""Object that is automatically created on import."""

adafruit_pybadger/pewpewm4.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
"""
2727

2828
from collections import namedtuple
29-
import board
29+
3030
import audioio
31+
import board
3132
import keypad
32-
from adafruit_pybadger.pybadger_base import PyBadgerBase, KeyStates
3333

34+
from adafruit_pybadger.pybadger_base import KeyStates, PyBadgerBase
3435

3536
__version__ = "0.0.0+auto.0"
3637
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PyBadger.git"
@@ -80,9 +81,7 @@ def button(self) -> Buttons:
8081
print("Button O")
8182
"""
8283
self._buttons.update()
83-
button_values = tuple(
84-
self._buttons.was_pressed(i) for i in range(self._keys.key_count)
85-
)
84+
button_values = tuple(self._buttons.was_pressed(i) for i in range(self._keys.key_count))
8685
return Buttons(
8786
button_values[0],
8887
button_values[1],
@@ -106,5 +105,5 @@ def _unsupported(self):
106105
pixels = _unsupported
107106

108107

109-
pewpewm4 = PewPewM4() # pylint: disable=invalid-name
108+
pewpewm4 = PewPewM4()
110109
"""Object that is automatically created on import."""

adafruit_pybadger/pybadge.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@
3131
"""
3232

3333
from collections import namedtuple
34-
import board
35-
import digitalio
34+
35+
import adafruit_lis3dh
3636
import analogio
3737
import audioio
38+
import board
39+
import digitalio
3840
import keypad
39-
import adafruit_lis3dh
4041
import neopixel
41-
from adafruit_pybadger.pybadger_base import PyBadgerBase, KeyStates
4242

43+
from adafruit_pybadger.pybadger_base import KeyStates, PyBadgerBase
4344

4445
__version__ = "0.0.0+auto.0"
4546
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_PyBadger.git"
@@ -75,12 +76,10 @@ def __init__(self) -> None:
7576
break
7677

7778
# PyBadge LC doesn't have accelerometer
78-
if int(0x18) in _i2c_devices or int(0x19) in _i2c_devices:
79+
if 0x18 in _i2c_devices or 0x19 in _i2c_devices:
7980
int1 = digitalio.DigitalInOut(board.ACCELEROMETER_INTERRUPT)
8081
try:
81-
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(
82-
i2c, address=0x19, int1=int1
83-
)
82+
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(i2c, address=0x19, int1=int1)
8483
except ValueError:
8584
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(i2c, int1=int1)
8685

@@ -122,9 +121,7 @@ def button(self) -> Buttons:
122121
123122
"""
124123
self._buttons.update()
125-
button_values = tuple(
126-
self._buttons.was_pressed(i) for i in range(self._keys.key_count)
127-
)
124+
button_values = tuple(self._buttons.was_pressed(i) for i in range(self._keys.key_count))
128125
return Buttons(
129126
button_values[0],
130127
button_values[1],
@@ -137,5 +134,5 @@ def button(self) -> Buttons:
137134
)
138135

139136

140-
pybadge = PyBadge() # pylint: disable=invalid-name
137+
pybadge = PyBadge()
141138
"""Object that is automatically created on import."""

0 commit comments

Comments
 (0)