Skip to content

Commit da54d4e

Browse files
authored
Merge pull request #14 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents 98f4690 + c0dabd2 commit da54d4e

File tree

5 files changed

+103
-86
lines changed

5 files changed

+103
-86
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
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_ws2801.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
### based on https://github.com/adafruit/Adafruit_CircuitPython_DotStar
4141

42+
4243
class WS2801:
4344
"""
4445
A sequence of WS2801 controlled LEDs.
@@ -72,7 +73,7 @@ def __init__(self, clock, data, n, *, brightness=1.0, auto_write=True):
7273
self._spi = busio.SPI(clock, MOSI=data)
7374
while not self._spi.try_lock():
7475
pass
75-
self._spi.configure(baudrate=1000*1000)
76+
self._spi.configure(baudrate=1000 * 1000)
7677
except ValueError:
7778
self.dpin = digitalio.DigitalInOut(data)
7879
self.cpin = digitalio.DigitalInOut(clock)
@@ -114,8 +115,8 @@ def _set_item(self, index, value):
114115
offset = index * 3
115116
if isinstance(value, int):
116117
r = value >> 16
117-
g = (value >> 8) & 0xff
118-
b = value & 0xff
118+
g = (value >> 8) & 0xFF
119+
b = value & 0xFF
119120
else:
120121
r, g, b = value
121122
# red/green/blue order for WS2801
@@ -143,8 +144,7 @@ def __getitem__(self, index):
143144
if isinstance(index, slice):
144145
out = []
145146
for in_i in range(*index.indices(self._n)):
146-
out.append(
147-
tuple(self._buf[in_i * 3 + i] for i in range(3)))
147+
out.append(tuple(self._buf[in_i * 3 + i] for i in range(3)))
148148
return out
149149
if index < 0:
150150
index += len(self)
@@ -180,7 +180,7 @@ def fill(self, color):
180180
def _ds_writebytes(self, buf):
181181
for b in buf:
182182
for _ in range(8):
183-
self.dpin.value = (b & 0x80)
183+
self.dpin.value = b & 0x80
184184
self.cpin.value = True
185185
self.cpin.value = False
186186
b = b << 1

docs/conf.py

Lines changed: 69 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,54 @@
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
### Using busio
2021
# autodoc_mock_imports = ["digitalio", "busio"]
2122

22-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
23+
intersphinx_mapping = {
24+
"python": ("https://docs.python.org/3.4", None),
25+
"BusDevice": (
26+
"https://circuitpython.readthedocs.io/projects/busdevice/en/latest/",
27+
None,
28+
),
29+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
30+
}
2331

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

27-
source_suffix = '.rst'
35+
source_suffix = ".rst"
2836

2937
# The master toctree document.
30-
master_doc = 'index'
38+
master_doc = "index"
3139

3240
# General information about the project.
33-
project = u'Adafruit WS2801 Library'
34-
copyright = u'2018 Damien P. George, Limor Fried & Scott Shawcroft, Kevin J Walters'
35-
author = u'Damien P. George, Limor Fried & Scott Shawcroft, Kevin J Walters'
41+
project = u"Adafruit WS2801 Library"
42+
copyright = u"2018 Damien P. George, Limor Fried & Scott Shawcroft, Kevin J Walters"
43+
author = u"Damien P. George, Limor Fried & Scott Shawcroft, Kevin J Walters"
3644

3745
# The version info for the project you're documenting, acts as replacement for
3846
# |version| and |release|, also used in various other places throughout the
3947
# built documents.
4048
#
4149
# The short X.Y version.
42-
version = u'1.0'
50+
version = u"1.0"
4351
# The full version, including alpha/beta/rc tags.
44-
release = u'1.0'
52+
release = u"1.0"
4553

4654
# The language for content autogenerated by Sphinx. Refer to documentation
4755
# for a list of supported languages.
@@ -53,7 +61,7 @@
5361
# List of patterns, relative to source directory, that match files and
5462
# directories to ignore when looking for source files.
5563
# This patterns also effect to html_static_path and html_extra_path
56-
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"]
5765

5866
# The reST default role (used for this markup: `text`) to use for all
5967
# documents.
@@ -65,7 +73,7 @@
6573
add_function_parentheses = True
6674

6775
# The name of the Pygments (syntax highlighting) style to use.
68-
pygments_style = 'sphinx'
76+
pygments_style = "sphinx"
6977

7078
# If true, `todo` and `todoList` produce output, else they produce nothing.
7179
todo_include_todos = False
@@ -80,68 +88,76 @@
8088
# The theme to use for HTML and HTML Help pages. See the documentation for
8189
# a list of builtin themes.
8290
#
83-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
91+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
8492

8593
if not on_rtd: # only import and set the theme if we're building docs locally
8694
try:
8795
import sphinx_rtd_theme
88-
html_theme = 'sphinx_rtd_theme'
89-
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(), "."]
9099
except:
91-
html_theme = 'default'
92-
html_theme_path = ['.']
100+
html_theme = "default"
101+
html_theme_path = ["."]
93102
else:
94-
html_theme_path = ['.']
103+
html_theme_path = ["."]
95104

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

101110
# The name of an image file (relative to this directory) to use as a favicon of
102111
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
103112
# pixels large.
104113
#
105-
html_favicon = '_static/favicon.ico'
114+
html_favicon = "_static/favicon.ico"
106115

107116
# Output file base name for HTML help builder.
108-
htmlhelp_basename = 'AdafruitWs2801Librarydoc'
117+
htmlhelp_basename = "AdafruitWs2801Librarydoc"
109118

110119
# -- Options for LaTeX output ---------------------------------------------
111120

112121
latex_elements = {
113-
# The paper size ('letterpaper' or 'a4paper').
114-
#
115-
# 'papersize': 'letterpaper',
116-
117-
# The font size ('10pt', '11pt' or '12pt').
118-
#
119-
# 'pointsize': '10pt',
120-
121-
# Additional stuff for the LaTeX preamble.
122-
#
123-
# 'preamble': '',
124-
125-
# Latex figure (float) alignment
126-
#
127-
# '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',
128134
}
129135

130136
# Grouping the document tree into LaTeX files. List of tuples
131137
# (source start file, target name, title,
132138
# author, documentclass [howto, manual, or own class]).
133139
latex_documents = [
134-
(master_doc, 'AdafruitWS2801Library.tex', u'AdafruitWS2801 Library Documentation',
135-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitWS2801Library.tex",
143+
u"AdafruitWS2801 Library Documentation",
144+
author,
145+
"manual",
146+
),
136147
]
137148

138149
# -- Options for manual page output ---------------------------------------
139150

140151
# One entry per manual page. List of tuples
141152
# (source start file, name, description, authors, manual section).
142153
man_pages = [
143-
(master_doc, 'AdafruitWS2801library', u'Adafruit WS2801 Library Documentation',
144-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitWS2801library",
157+
u"Adafruit WS2801 Library Documentation",
158+
[author],
159+
1,
160+
)
145161
]
146162

147163
# -- Options for Texinfo output -------------------------------------------
@@ -150,7 +166,13 @@
150166
# (source start file, target name, title, author,
151167
# dir menu entry, description, category)
152168
texinfo_documents = [
153-
(master_doc, 'AdafruitWS2801Library', u'Adafruit WS2801 Library Documentation',
154-
author, 'AdafruitWS2801Library', 'One line description of project.',
155-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitWS2801Library",
172+
u"Adafruit WS2801 Library Documentation",
173+
author,
174+
"AdafruitWS2801Library",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
156178
]

examples/ws2801_simpletest.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,25 @@
1111
oclock = board.D6
1212
numleds = 25
1313
bright = 1.0
14-
leds = adafruit_ws2801.WS2801(oclock, odata, numleds, brightness=bright, auto_write=False)
14+
leds = adafruit_ws2801.WS2801(
15+
oclock, odata, numleds, brightness=bright, auto_write=False
16+
)
1517

1618
######################### HELPERS ##############################
1719

1820
# a random color 0 -> 224
1921
def random_color():
2022
return random.randrange(0, 7) * 32
2123

24+
2225
######################### MAIN LOOP ##############################
2326
n_leds = len(leds)
2427
while True:
25-
#fill each led with a random color
28+
# fill each led with a random color
2629
for idx in range(n_leds):
2730
leds[idx] = (random_color(), random_color(), random_color())
2831

2932
# show all leds in led string
3033
leds.show()
3134

32-
time.sleep(.25)
35+
time.sleep(0.25)

setup.py

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,46 @@
77

88
# Always prefer setuptools over distutils
99
from setuptools import setup, find_packages
10+
1011
# To use a consistent encoding
1112
from codecs import open
1213
from os import path
1314

1415
here = path.abspath(path.dirname(__file__))
1516

1617
# Get the long description from the README file
17-
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
18+
with open(path.join(here, "README.rst"), encoding="utf-8") as f:
1819
long_description = f.read()
1920

2021
setup(
21-
name='adafruit-circuitpython-ws2801',
22-
22+
name="adafruit-circuitpython-ws2801",
2323
use_scm_version=True,
24-
setup_requires=['setuptools_scm'],
25-
26-
description='CircuitPython library for WS2801 LEDs.',
24+
setup_requires=["setuptools_scm"],
25+
description="CircuitPython library for WS2801 LEDs.",
2726
long_description=long_description,
28-
long_description_content_type='text/x-rst',
29-
27+
long_description_content_type="text/x-rst",
3028
# The project's main homepage.
31-
url='https://github.com/adafruit/Adafruit_CircuitPython_WS2801',
32-
29+
url="https://github.com/adafruit/Adafruit_CircuitPython_WS2801",
3330
# Author details
34-
author='Adafruit Industries',
35-
author_email='[email protected]',
36-
37-
install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'],
38-
31+
author="Adafruit Industries",
32+
author_email="[email protected]",
33+
install_requires=["Adafruit-Blinka", "adafruit-circuitpython-busdevice"],
3934
# Choose your license
40-
license='MIT',
41-
35+
license="MIT",
4236
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
4337
classifiers=[
44-
'Development Status :: 3 - Alpha',
45-
'Intended Audience :: Developers',
46-
'Topic :: Software Development :: Libraries',
47-
'Topic :: System :: Hardware',
48-
'License :: OSI Approved :: MIT License',
49-
'Programming Language :: Python :: 3',
50-
'Programming Language :: Python :: 3.4',
51-
'Programming Language :: Python :: 3.5',
38+
"Development Status :: 3 - Alpha",
39+
"Intended Audience :: Developers",
40+
"Topic :: Software Development :: Libraries",
41+
"Topic :: System :: Hardware",
42+
"License :: OSI Approved :: MIT License",
43+
"Programming Language :: Python :: 3",
44+
"Programming Language :: Python :: 3.4",
45+
"Programming Language :: Python :: 3.5",
5246
],
53-
5447
# What does your project relate to?
55-
keywords='adafruit ws2801 leds led rgb hardware micropython circuitpython',
56-
48+
keywords="adafruit ws2801 leds led rgb hardware micropython circuitpython",
5749
# You can just specify the packages manually here if your project is
5850
# simple. Or you can use find_packages().
59-
py_modules=['adafruit_ws2801'],
51+
py_modules=["adafruit_ws2801"],
6052
)

0 commit comments

Comments
 (0)