Skip to content

Commit 81b1ad0

Browse files
FoamyGuyFoamyGuy
committed
convert to ruff pre-commit
1 parent 1a82192 commit 81b1ad0

File tree

7 files changed

+139
-57
lines changed

7 files changed

+139
-57
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
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
@@ -17,9 +17,9 @@ Introduction
1717
:alt: Build Status
1818

1919

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

2424
Driver for 7.3" 7-color (aka ACeP) epaper display
2525

‎adafruit_acep7in.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
2222
"""
2323

24-
from fourwire import FourWire
2524
from epaperdisplay import EPaperDisplay
25+
from fourwire import FourWire
2626

2727
__version__ = "0.0.0+auto.0"
2828
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ACeP7In.git"
2929

3030
_START_SEQUENCE = (
3131
b"\xaa\x06\x49\x55\x20\x08\x09\x18" # CMDH
32-
b"\x01\x06\x3F\x00\x32\x2A\x0E\x2A" # power setting PWRR
32+
b"\x01\x06\x3f\x00\x32\x2a\x0e\x2a" # power setting PWRR
3333
b"\x00\x02\x5f\x69" # panel setting (PSR)
3434
b"\x03\x04\x00\x54\x00\x44" # POFS
35-
b"\x05\x04\x40\x1F\x1F\x2C" # booster BTST1
36-
b"\x06\x04\x6F\x1F\x16\x25" # booster BTST2
37-
b"\x08\x04\x6F\x1F\x1F\x22" # booster BTST3
35+
b"\x05\x04\x40\x1f\x1f\x2c" # booster BTST1
36+
b"\x06\x04\x6f\x1f\x16\x25" # booster BTST2
37+
b"\x08\x04\x6f\x1f\x1f\x22" # booster BTST3
3838
b"\x13\x02\x00\x04" # IPC
3939
b"\x30\x01\x02" # PLL setting
4040
b"\x41\x01\x00" # TSE
41-
b"\x50\x01\x3F" # vcom and data interval setting
41+
b"\x50\x01\x3f" # vcom and data interval setting
4242
b"\x60\x02\x02\x00" # tcon setting
4343
b"\x61\x04\x03\x20\x01\xe0" # tres
4444
b"\x82\x01\x1e" # vdcs
@@ -87,5 +87,5 @@ def __init__(self, bus: FourWire, **kwargs):
8787
busy_state=False,
8888
write_black_ram_command=0x10,
8989
refresh_display_command=b"\x12\x01\x00",
90-
advanced_color_epaper=True
90+
advanced_color_epaper=True,
9191
)

‎docs/conf.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# -*- coding: utf-8 -*-
2-
31
# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
42
#
53
# SPDX-License-Identifier: MIT
64

5+
import datetime
76
import os
87
import sys
9-
import datetime
108

119
sys.path.insert(0, os.path.abspath(".."))
1210

@@ -53,9 +51,7 @@
5351
creation_year = "2023"
5452
current_year = str(datetime.datetime.now().year)
5553
year_duration = (
56-
current_year
57-
if current_year == creation_year
58-
else creation_year + " - " + current_year
54+
current_year if current_year == creation_year else creation_year + " - " + current_year
5955
)
6056
copyright = year_duration + " Scott Shawcroft"
6157
author = "Scott Shawcroft"

‎examples/acep7in_simpletest.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
#
55
# SPDX-License-Identifier: Unlicense
66

7-
"""Simple test script for 5.6" 600x448 7-color ACeP display.
8-
"""
7+
"""Simple test script for 5.6" 600x448 7-color ACeP display."""
98
# pylint: disable=no-member
109

1110
import time
11+
1212
import board
1313
import displayio
14-
import adafruit_acep7in
1514
from fourwire import FourWire
1615

16+
import adafruit_acep7in
1717

1818
displayio.release_displays()
1919

@@ -24,13 +24,9 @@
2424
epd_reset = board.D11
2525
epd_busy = board.D12
2626

27-
display_bus = FourWire(
28-
spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
29-
)
27+
display_bus = FourWire(spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000)
3028

31-
display = adafruit_acep7in.ACeP7In(
32-
display_bus, width=800, height=480, busy_pin=epd_busy
33-
)
29+
display = adafruit_acep7in.ACeP7In(display_bus, width=800, height=480, busy_pin=epd_busy)
3430

3531
g = displayio.Group()
3632

‎ruff.toml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-FileCopyrightText: 2024 Tim Cocks for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
target-version = "py38"
6+
line-length = 100
7+
8+
[lint]
9+
preview = true
10+
select = ["I", "PL", "UP"]
11+
12+
extend-select = [
13+
"D419", # empty-docstring
14+
"E501", # line-too-long
15+
"W291", # trailing-whitespace
16+
"PLC0414", # useless-import-alias
17+
"PLC2401", # non-ascii-name
18+
"PLC2801", # unnecessary-dunder-call
19+
"PLC3002", # unnecessary-direct-lambda-call
20+
"E999", # syntax-error
21+
"PLE0101", # return-in-init
22+
"F706", # return-outside-function
23+
"F704", # yield-outside-function
24+
"PLE0116", # continue-in-finally
25+
"PLE0117", # nonlocal-without-binding
26+
"PLE0241", # duplicate-bases
27+
"PLE0302", # unexpected-special-method-signature
28+
"PLE0604", # invalid-all-object
29+
"PLE0605", # invalid-all-format
30+
"PLE0643", # potential-index-error
31+
"PLE0704", # misplaced-bare-raise
32+
"PLE1141", # dict-iter-missing-items
33+
"PLE1142", # await-outside-async
34+
"PLE1205", # logging-too-many-args
35+
"PLE1206", # logging-too-few-args
36+
"PLE1307", # bad-string-format-type
37+
"PLE1310", # bad-str-strip-call
38+
"PLE1507", # invalid-envvar-value
39+
"PLE2502", # bidirectional-unicode
40+
"PLE2510", # invalid-character-backspace
41+
"PLE2512", # invalid-character-sub
42+
"PLE2513", # invalid-character-esc
43+
"PLE2514", # invalid-character-nul
44+
"PLE2515", # invalid-character-zero-width-space
45+
"PLR0124", # comparison-with-itself
46+
"PLR0202", # no-classmethod-decorator
47+
"PLR0203", # no-staticmethod-decorator
48+
"UP004", # useless-object-inheritance
49+
"PLR0206", # property-with-parameters
50+
"PLR0904", # too-many-public-methods
51+
"PLR0911", # too-many-return-statements
52+
"PLR0912", # too-many-branches
53+
"PLR0913", # too-many-arguments
54+
"PLR0914", # too-many-locals
55+
"PLR0915", # too-many-statements
56+
"PLR0916", # too-many-boolean-expressions
57+
"PLR1702", # too-many-nested-blocks
58+
"PLR1704", # redefined-argument-from-local
59+
"PLR1711", # useless-return
60+
"C416", # unnecessary-comprehension
61+
"PLR1733", # unnecessary-dict-index-lookup
62+
"PLR1736", # unnecessary-list-index-lookup
63+
64+
# ruff reports this rule is unstable
65+
#"PLR6301", # no-self-use
66+
67+
"PLW0108", # unnecessary-lambda
68+
"PLW0120", # useless-else-on-loop
69+
"PLW0127", # self-assigning-variable
70+
"PLW0129", # assert-on-string-literal
71+
"B033", # duplicate-value
72+
"PLW0131", # named-expr-without-context
73+
"PLW0245", # super-without-brackets
74+
"PLW0406", # import-self
75+
"PLW0602", # global-variable-not-assigned
76+
"PLW0603", # global-statement
77+
"PLW0604", # global-at-module-level
78+
79+
# fails on the try: import typing used by libraries
80+
#"F401", # unused-import
81+
82+
"F841", # unused-variable
83+
"E722", # bare-except
84+
"PLW0711", # binary-op-exception
85+
"PLW1501", # bad-open-mode
86+
"PLW1508", # invalid-envvar-default
87+
"PLW1509", # subprocess-popen-preexec-fn
88+
"PLW2101", # useless-with-lock
89+
"PLW3301", # nested-min-max
90+
]
91+
92+
ignore = [
93+
"PLR2004", # magic-value-comparison
94+
"UP030", # format literals
95+
"PLW1514", # unspecified-encoding
96+
97+
]
98+
99+
[format]
100+
line-ending = "lf"

0 commit comments

Comments
 (0)