Skip to content

Commit 82ec6a8

Browse files
evaherradaevaherrada
committed
Pylint and RTD update patch, and other fixes
1 parent 0c0b58e commit 82ec6a8

12 files changed

+49
-36
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
# (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.)
4343
run: |
4444
source actions-ci/install.sh
45-
- name: Pip install pylint, Sphinx, pre-commit
45+
- name: Pip install Sphinx, pre-commit
4646
run: |
47-
pip install --force-reinstall pylint Sphinx sphinx-rtd-theme pre-commit
47+
pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
4848
- name: Library version
4949
run: git describe --dirty --always --tags
5050
- name: Pre-commit hooks

‎.pre-commit-config.yaml

+17-9
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,25 @@ repos:
1818
- id: end-of-file-fixer
1919
- id: trailing-whitespace
2020
- repo: https://github.com/pycqa/pylint
21-
rev: pylint-2.7.1
21+
rev: v2.11.1
2222
hooks:
2323
- id: pylint
2424
name: pylint (library code)
2525
types: [python]
26-
exclude: "^(docs/|examples/|setup.py$)"
27-
- repo: local
28-
hooks:
29-
- id: pylint_examples
30-
name: pylint (examples code)
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)
3131
description: Run pylint rules on "examples/*.py" files
32-
entry: /usr/bin/env bash -c
33-
args: ['([[ ! -d "examples" ]] || for example in $(find . -path "./examples/*.py"); do pylint --disable=missing-docstring,invalid-name,consider-using-f-string $example; done)']
34-
language: system
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

‎.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ ignore-docstrings=yes
253253
ignore-imports=yes
254254

255255
# Minimum lines number of a similarity.
256-
min-similarity-lines=50
256+
min-similarity-lines=12
257257

258258

259259
[BASIC]

‎adafruit_rgb_display/rgb.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
except ImportError:
2323
import ustruct as struct
2424

25-
import adafruit_bus_device.spi_device as spi_device
25+
from adafruit_bus_device import spi_device
2626

2727
__version__ = "0.0.0-auto.0"
2828
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git"

‎adafruit_rgb_display/ssd1351.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def __init__(
113113
y_offset=0,
114114
rotation=0
115115
):
116-
if baudrate > 16000000: # Limit to Display Max Baudrate
117-
baudrate = 16000000
116+
baudrate = min(baudrate, 16000000) # Limit to Display Max Baudrate
117+
118118
super().__init__(
119119
spi,
120120
dc,

‎docs/requirements.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-FileCopyrightText: 2021 Kattni Rembor for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
sphinx>=4.0.0

‎examples/rgb_display_fbcp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import digitalio
1010
import board
1111
from PIL import Image, ImageDraw
12-
import adafruit_rgb_display.st7789 as st7789
12+
from adafruit_rgb_display import st7789
1313

1414
# definitions from linux/fb.h
1515
FBIOGET_VSCREENINFO = 0x4600

‎examples/rgb_display_minipitftstats.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import digitalio
99
import board
1010
from PIL import Image, ImageDraw, ImageFont
11-
import adafruit_rgb_display.st7789 as st7789
11+
from adafruit_rgb_display import st7789
1212

1313

1414
# Configuration for CS and DC pins (these are FeatherWing defaults on M0/M4):

‎examples/rgb_display_minipitfttest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import board
66

77
from adafruit_rgb_display.rgb import color565
8-
import adafruit_rgb_display.st7789 as st7789
8+
from adafruit_rgb_display import st7789
99

1010
# Configuration for CS and DC pins for Raspberry Pi
1111
cs_pin = digitalio.DigitalInOut(board.CE0)

‎examples/rgb_display_pillow_demo.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import digitalio
1616
import board
1717
from PIL import Image, ImageDraw, ImageFont
18-
import adafruit_rgb_display.ili9341 as ili9341
19-
import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import
20-
import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import
21-
import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import
22-
import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import
23-
import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import
18+
from adafruit_rgb_display import ili9341
19+
from adafruit_rgb_display import st7789 # pylint: disable=unused-import
20+
from adafruit_rgb_display import hx8357 # pylint: disable=unused-import
21+
from adafruit_rgb_display import st7735 # pylint: disable=unused-import
22+
from adafruit_rgb_display import ssd1351 # pylint: disable=unused-import
23+
from adafruit_rgb_display import ssd1331 # pylint: disable=unused-import
2424

2525
# First define some constants to allow easy resizing of shapes.
2626
BORDER = 20

‎examples/rgb_display_pillow_image.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import digitalio
1515
import board
1616
from PIL import Image, ImageDraw
17-
import adafruit_rgb_display.ili9341 as ili9341
18-
import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import
19-
import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import
20-
import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import
21-
import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import
22-
import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import
17+
from adafruit_rgb_display import ili9341
18+
from adafruit_rgb_display import st7789 # pylint: disable=unused-import
19+
from adafruit_rgb_display import hx8357 # pylint: disable=unused-import
20+
from adafruit_rgb_display import st7735 # pylint: disable=unused-import
21+
from adafruit_rgb_display import ssd1351 # pylint: disable=unused-import
22+
from adafruit_rgb_display import ssd1331 # pylint: disable=unused-import
2323

2424
# Configuration for CS and DC pins (these are PiTFT defaults):
2525
cs_pin = digitalio.DigitalInOut(board.CE0)

‎examples/rgb_display_pillow_stats.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
import digitalio
1717
import board
1818
from PIL import Image, ImageDraw, ImageFont
19-
import adafruit_rgb_display.ili9341 as ili9341
20-
import adafruit_rgb_display.st7789 as st7789 # pylint: disable=unused-import
21-
import adafruit_rgb_display.hx8357 as hx8357 # pylint: disable=unused-import
22-
import adafruit_rgb_display.st7735 as st7735 # pylint: disable=unused-import
23-
import adafruit_rgb_display.ssd1351 as ssd1351 # pylint: disable=unused-import
24-
import adafruit_rgb_display.ssd1331 as ssd1331 # pylint: disable=unused-import
19+
from adafruit_rgb_display import ili9341
20+
from adafruit_rgb_display import st7789 # pylint: disable=unused-import
21+
from adafruit_rgb_display import hx8357 # pylint: disable=unused-import
22+
from adafruit_rgb_display import st7735 # pylint: disable=unused-import
23+
from adafruit_rgb_display import ssd1351 # pylint: disable=unused-import
24+
from adafruit_rgb_display import ssd1331 # pylint: disable=unused-import
2525

2626
# Configuration for CS and DC pins (these are PiTFT defaults):
2727
cs_pin = digitalio.DigitalInOut(board.CE0)

0 commit comments

Comments
 (0)