Skip to content

Commit dc2a108

Browse files
authored
Merge pull request #15 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents e920cbd + 3d6c4bd commit dc2a108

7 files changed

+121
-98
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
source actions-ci/install.sh
4141
- name: Pip install pylint, black, & Sphinx
4242
run: |
43-
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
43+
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_st7789.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,19 @@
4848
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ST7789.git"
4949

5050
_INIT_SEQUENCE = (
51-
b"\x01\x80\x96" # _SWRESET and Delay 150ms
52-
b"\x11\x80\xFF" # _SLPOUT and Delay 500ms
53-
b"\x3A\x81\x55\x0A" # _COLMOD and Delay 10ms
54-
b"\x36\x01\x08" # _MADCTL
55-
b"\x21\x80\x0A" # _INVON Hack and Delay 10ms
56-
b"\x13\x80\x0A" # _NORON and Delay 10ms
57-
b"\x36\x01\xC0" # _MADCTL
58-
b"\x29\x80\xFF" # _DISPON and Delay 500ms
51+
b"\x01\x80\x96" # _SWRESET and Delay 150ms
52+
b"\x11\x80\xFF" # _SLPOUT and Delay 500ms
53+
b"\x3A\x81\x55\x0A" # _COLMOD and Delay 10ms
54+
b"\x36\x01\x08" # _MADCTL
55+
b"\x21\x80\x0A" # _INVON Hack and Delay 10ms
56+
b"\x13\x80\x0A" # _NORON and Delay 10ms
57+
b"\x36\x01\xC0" # _MADCTL
58+
b"\x29\x80\xFF" # _DISPON and Delay 500ms
5959
)
6060

6161
# pylint: disable=too-few-public-methods
6262
class ST7789(displayio.Display):
6363
"""ST7789 driver"""
64+
6465
def __init__(self, bus, **kwargs):
6566
super().__init__(bus, _INIT_SEQUENCE, **kwargs)

docs/conf.py

+65-47
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
import os
44
import sys
5-
sys.path.insert(0, os.path.abspath('..'))
5+
6+
sys.path.insert(0, os.path.abspath(".."))
67

78
# -- General configuration ------------------------------------------------
89

910
# Add any Sphinx extension module names here, as strings. They can be
1011
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
1112
# ones.
1213
extensions = [
13-
'sphinx.ext.autodoc',
14-
'sphinx.ext.intersphinx',
15-
'sphinx.ext.napoleon',
16-
'sphinx.ext.todo',
14+
"sphinx.ext.autodoc",
15+
"sphinx.ext.intersphinx",
16+
"sphinx.ext.napoleon",
17+
"sphinx.ext.todo",
1718
]
1819

1920
# TODO: Please Read!
@@ -23,29 +24,32 @@
2324
# autodoc_mock_imports = ["digitalio", "busio"]
2425
autodoc_mock_imports = ["displayio"]
2526

26-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
27+
intersphinx_mapping = {
28+
"python": ("https://docs.python.org/3.4", None),
29+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
30+
}
2731

2832
# Add any paths that contain templates here, relative to this directory.
29-
templates_path = ['_templates']
33+
templates_path = ["_templates"]
3034

31-
source_suffix = '.rst'
35+
source_suffix = ".rst"
3236

3337
# The master toctree document.
34-
master_doc = 'index'
38+
master_doc = "index"
3539

3640
# General information about the project.
37-
project = u'Adafruit ST7789 Library'
38-
copyright = u'2019 Melissa LeBlanc-Williams'
39-
author = u'Melissa LeBlanc-Williams'
41+
project = "Adafruit ST7789 Library"
42+
copyright = "2019 Melissa LeBlanc-Williams"
43+
author = "Melissa LeBlanc-Williams"
4044

4145
# The version info for the project you're documenting, acts as replacement for
4246
# |version| and |release|, also used in various other places throughout the
4347
# built documents.
4448
#
4549
# The short X.Y version.
46-
version = u'1.0'
50+
version = "1.0"
4751
# The full version, including alpha/beta/rc tags.
48-
release = u'1.0'
52+
release = "1.0"
4953

5054
# The language for content autogenerated by Sphinx. Refer to documentation
5155
# for a list of supported languages.
@@ -57,7 +61,7 @@
5761
# List of patterns, relative to source directory, that match files and
5862
# directories to ignore when looking for source files.
5963
# This patterns also effect to html_static_path and html_extra_path
60-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
64+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]
6165

6266
# The reST default role (used for this markup: `text`) to use for all
6367
# documents.
@@ -69,7 +73,7 @@
6973
add_function_parentheses = True
7074

7175
# The name of the Pygments (syntax highlighting) style to use.
72-
pygments_style = 'sphinx'
76+
pygments_style = "sphinx"
7377

7478
# If true, `todo` and `todoList` produce output, else they produce nothing.
7579
todo_include_todos = False
@@ -84,68 +88,76 @@
8488
# The theme to use for HTML and HTML Help pages. See the documentation for
8589
# a list of builtin themes.
8690
#
87-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
91+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
8892

8993
if not on_rtd: # only import and set the theme if we're building docs locally
9094
try:
9195
import sphinx_rtd_theme
92-
html_theme = 'sphinx_rtd_theme'
93-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
96+
97+
html_theme = "sphinx_rtd_theme"
98+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
9499
except:
95-
html_theme = 'default'
96-
html_theme_path = ['.']
100+
html_theme = "default"
101+
html_theme_path = ["."]
97102
else:
98-
html_theme_path = ['.']
103+
html_theme_path = ["."]
99104

100105
# Add any paths that contain custom static files (such as style sheets) here,
101106
# relative to this directory. They are copied after the builtin static files,
102107
# so a file named "default.css" will overwrite the builtin "default.css".
103-
html_static_path = ['_static']
108+
html_static_path = ["_static"]
104109

105110
# The name of an image file (relative to this directory) to use as a favicon of
106111
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
107112
# pixels large.
108113
#
109-
html_favicon = '_static/favicon.ico'
114+
html_favicon = "_static/favicon.ico"
110115

111116
# Output file base name for HTML help builder.
112-
htmlhelp_basename = 'AdafruitSt7789Librarydoc'
117+
htmlhelp_basename = "AdafruitSt7789Librarydoc"
113118

114119
# -- Options for LaTeX output ---------------------------------------------
115120

116121
latex_elements = {
117-
# The paper size ('letterpaper' or 'a4paper').
118-
#
119-
# 'papersize': 'letterpaper',
120-
121-
# The font size ('10pt', '11pt' or '12pt').
122-
#
123-
# 'pointsize': '10pt',
124-
125-
# Additional stuff for the LaTeX preamble.
126-
#
127-
# 'preamble': '',
128-
129-
# Latex figure (float) alignment
130-
#
131-
# 'figure_align': 'htbp',
122+
# The paper size ('letterpaper' or 'a4paper').
123+
#
124+
# 'papersize': 'letterpaper',
125+
# The font size ('10pt', '11pt' or '12pt').
126+
#
127+
# 'pointsize': '10pt',
128+
# Additional stuff for the LaTeX preamble.
129+
#
130+
# 'preamble': '',
131+
# Latex figure (float) alignment
132+
#
133+
# 'figure_align': 'htbp',
132134
}
133135

134136
# Grouping the document tree into LaTeX files. List of tuples
135137
# (source start file, target name, title,
136138
# author, documentclass [howto, manual, or own class]).
137139
latex_documents = [
138-
(master_doc, 'AdafruitST7789Library.tex', u'AdafruitST7789 Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitST7789Library.tex",
143+
"AdafruitST7789 Library Documentation",
144+
author,
145+
"manual",
146+
),
140147
]
141148

142149
# -- Options for manual page output ---------------------------------------
143150

144151
# One entry per manual page. List of tuples
145152
# (source start file, name, description, authors, manual section).
146153
man_pages = [
147-
(master_doc, 'AdafruitST7789library', u'Adafruit ST7789 Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitST7789library",
157+
"Adafruit ST7789 Library Documentation",
158+
[author],
159+
1,
160+
)
149161
]
150162

151163
# -- Options for Texinfo output -------------------------------------------
@@ -154,7 +166,13 @@
154166
# (source start file, target name, title, author,
155167
# dir menu entry, description, category)
156168
texinfo_documents = [
157-
(master_doc, 'AdafruitST7789Library', u'Adafruit ST7789 Library Documentation',
158-
author, 'AdafruitST7789Library', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitST7789Library",
172+
"Adafruit ST7789 Library Documentation",
173+
author,
174+
"AdafruitST7789Library",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/st7789_240x135_simpletest.py

+17-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
tft_dc = board.D6
2424

2525
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs)
26-
display = ST7789(display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53)
26+
display = ST7789(
27+
display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53
28+
)
2729

2830
# Make the display context
2931
splash = displayio.Group(max_size=10)
@@ -33,27 +35,31 @@
3335
color_palette = displayio.Palette(1)
3436
color_palette[0] = BACKGROUND_COLOR
3537

36-
bg_sprite = displayio.TileGrid(color_bitmap,
37-
pixel_shader=color_palette,
38-
x=0, y=0)
38+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
3939
splash.append(bg_sprite)
4040

4141
# Draw a smaller inner rectangle
42-
inner_bitmap = displayio.Bitmap(display.width - BORDER * 2, display.height - BORDER * 2, 1)
42+
inner_bitmap = displayio.Bitmap(
43+
display.width - BORDER * 2, display.height - BORDER * 2, 1
44+
)
4345
inner_palette = displayio.Palette(1)
4446
inner_palette[0] = FOREGROUND_COLOR
45-
inner_sprite = displayio.TileGrid(inner_bitmap,
46-
pixel_shader=inner_palette,
47-
x=BORDER, y=BORDER)
47+
inner_sprite = displayio.TileGrid(
48+
inner_bitmap, pixel_shader=inner_palette, x=BORDER, y=BORDER
49+
)
4850
splash.append(inner_sprite)
4951

5052
# Draw a label
5153
text = "Hello World!"
5254
text_area = label.Label(terminalio.FONT, text=text, color=TEXT_COLOR)
5355
text_width = text_area.bounding_box[2] * FONTSCALE
54-
text_group = displayio.Group(max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2,
55-
y=display.height // 2)
56-
text_group.append(text_area) # Subgroup for text scaling
56+
text_group = displayio.Group(
57+
max_size=10,
58+
scale=FONTSCALE,
59+
x=display.width // 2 - text_width // 2,
60+
y=display.height // 2,
61+
)
62+
text_group.append(text_area) # Subgroup for text scaling
5763
splash.append(text_group)
5864

5965
while True:

examples/st7789_320x240_simpletest.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
tft_cs = board.D5
1616
tft_dc = board.D6
1717

18-
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9)
18+
display_bus = displayio.FourWire(
19+
spi, command=tft_dc, chip_select=tft_cs, reset=board.D9
20+
)
1921

2022
display = ST7789(display_bus, width=320, height=240, rotation=90)
2123

@@ -25,27 +27,23 @@
2527

2628
color_bitmap = displayio.Bitmap(320, 240, 1)
2729
color_palette = displayio.Palette(1)
28-
color_palette[0] = 0x00FF00 # Bright Green
30+
color_palette[0] = 0x00FF00 # Bright Green
2931

30-
bg_sprite = displayio.TileGrid(color_bitmap,
31-
pixel_shader=color_palette,
32-
x=0, y=0)
32+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
3333
splash.append(bg_sprite)
3434

3535
# Draw a smaller inner rectangle
3636
inner_bitmap = displayio.Bitmap(280, 200, 1)
3737
inner_palette = displayio.Palette(1)
38-
inner_palette[0] = 0xAA0088 # Purple
39-
inner_sprite = displayio.TileGrid(inner_bitmap,
40-
pixel_shader=inner_palette,
41-
x=20, y=20)
38+
inner_palette[0] = 0xAA0088 # Purple
39+
inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=20, y=20)
4240
splash.append(inner_sprite)
4341

4442
# Draw a label
4543
text_group = displayio.Group(max_size=10, scale=3, x=57, y=120)
4644
text = "Hello World!"
4745
text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00)
48-
text_group.append(text_area) # Subgroup for text scaling
46+
text_group.append(text_area) # Subgroup for text scaling
4947
splash.append(text_group)
5048

5149
while True:

examples/st7789_simpletest.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
tft_cs = board.D5
1616
tft_dc = board.D6
1717

18-
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9)
18+
display_bus = displayio.FourWire(
19+
spi, command=tft_dc, chip_select=tft_cs, reset=board.D9
20+
)
1921

2022
display = ST7789(display_bus, width=240, height=240, rowstart=80)
2123

@@ -25,27 +27,23 @@
2527

2628
color_bitmap = displayio.Bitmap(240, 240, 1)
2729
color_palette = displayio.Palette(1)
28-
color_palette[0] = 0x00FF00 # Bright Green
30+
color_palette[0] = 0x00FF00 # Bright Green
2931

30-
bg_sprite = displayio.TileGrid(color_bitmap,
31-
pixel_shader=color_palette,
32-
x=0, y=0)
32+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
3333
splash.append(bg_sprite)
3434

3535
# Draw a smaller inner rectangle
3636
inner_bitmap = displayio.Bitmap(200, 200, 1)
3737
inner_palette = displayio.Palette(1)
38-
inner_palette[0] = 0xAA0088 # Purple
39-
inner_sprite = displayio.TileGrid(inner_bitmap,
40-
pixel_shader=inner_palette,
41-
x=20, y=20)
38+
inner_palette[0] = 0xAA0088 # Purple
39+
inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=20, y=20)
4240
splash.append(inner_sprite)
4341

4442
# Draw a label
4543
text_group = displayio.Group(max_size=10, scale=2, x=50, y=120)
4644
text = "Hello World!"
4745
text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00)
48-
text_group.append(text_area) # Subgroup for text scaling
46+
text_group.append(text_area) # Subgroup for text scaling
4947
splash.append(text_group)
5048

5149
while True:

0 commit comments

Comments
 (0)