Skip to content

Commit 9941f16

Browse files
committed
Ran black, updated to pylint 2.x
1 parent 0c3f49c commit 9941f16

File tree

4 files changed

+101
-87
lines changed

4 files changed

+101
-87
lines changed

adafruit_ble_magic_light.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,23 @@
3535
__version__ = "0.0.0-auto.0"
3636
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE_Magic_Light.git"
3737

38+
3839
class MagicLightService(Service):
3940
"""Service for controlling a Magic Light RGB bulb."""
4041

4142
# These UUIDs actually use the standard base UUID even though they aren't standard.
4243
uuid = VendorUUID("0000ffe5-0000-1000-8000-00805f9b34fb")
4344

44-
_control = Characteristic(uuid=VendorUUID("0000ffe9-0000-1000-8000-00805f9b34fb"), max_length=7)
45+
_control = Characteristic(
46+
uuid=VendorUUID("0000ffe9-0000-1000-8000-00805f9b34fb"), max_length=7
47+
)
4548

4649
def __init__(self, service=None):
4750
super().__init__(service=service)
48-
self._color = 0xffffff
51+
self._color = 0xFFFFFF
4952
self._buf = bytearray(7)
5053
self._buf[0] = 0x56
51-
self._buf[6] = 0xaa
54+
self._buf[6] = 0xAA
5255
self._brightness = 1.0
5356

5457
def __getitem__(self, index):
@@ -60,16 +63,16 @@ def __setitem__(self, index, value):
6063
if index > 0:
6164
raise IndexError()
6265
if isinstance(value, int):
63-
r = (value >> 16) & 0xff
64-
g = (value >> 8) & 0xff
65-
b = value & 0xff
66+
r = (value >> 16) & 0xFF
67+
g = (value >> 8) & 0xFF
68+
b = value & 0xFF
6669
else:
6770
r, g, b = value
6871
self._buf[1] = r
6972
self._buf[2] = g
7073
self._buf[3] = b
7174
self._buf[4] = 0x00
72-
self._buf[5] = 0xf0
75+
self._buf[5] = 0xF0
7376
self._control = self._buf
7477
self._color = value
7578

docs/conf.py

Lines changed: 65 additions & 47 deletions
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 = ["adafruit_ble"]
2425

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 BLE_Magic_Light Library'
38-
copyright = u'2019 Scott Shawcroft'
39-
author = u'Scott Shawcroft'
41+
project = "Adafruit BLE_Magic_Light Library"
42+
copyright = "2019 Scott Shawcroft"
43+
author = "Scott Shawcroft"
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 = 'AdafruitBle_magic_lightLibrarydoc'
117+
htmlhelp_basename = "AdafruitBle_magic_lightLibrarydoc"
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, 'AdafruitBLE_Magic_LightLibrary.tex', u'AdafruitBLE_Magic_Light Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitBLE_Magic_LightLibrary.tex",
143+
"AdafruitBLE_Magic_Light 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, 'AdafruitBLE_Magic_Lightlibrary', u'Adafruit BLE_Magic_Light Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitBLE_Magic_Lightlibrary",
157+
"Adafruit BLE_Magic_Light 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, 'AdafruitBLE_Magic_LightLibrary', u'Adafruit BLE_Magic_Light Library Documentation',
158-
author, 'AdafruitBLE_Magic_LightLibrary', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitBLE_Magic_LightLibrary",
172+
"Adafruit BLE_Magic_Light Library Documentation",
173+
author,
174+
"AdafruitBLE_Magic_LightLibrary",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/ble_magic_light_simpletest.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@
55
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
66
from adafruit_ble_magic_light import MagicLightService
77

8+
89
def find_connection():
910
for connection in radio.connections:
1011
if MagicLightService not in connection:
1112
continue
1213
return connection, connection[MagicLightService]
1314
return None, None
1415

16+
1517
# Start advertising before messing with the display so that we can connect immediately.
1618
radio = adafruit_ble.BLERadio()
1719

20+
1821
def wheel(pos):
1922
# Input a value 0 to 255 to get a color value.
2023
# The colours are a transition r - g - b - back to r.
@@ -28,6 +31,7 @@ def wheel(pos):
2831
pos -= 170
2932
return (pos * 3, 0, 255 - pos * 3)
3033

34+
3135
active_connection, pixels = find_connection()
3236
current_notification = None
3337
app_icon_file = None
@@ -39,7 +43,7 @@ def wheel(pos):
3943
active_connection = radio.connect(scan)
4044
try:
4145
pixels = active_connection[MagicLightService]
42-
except _bleio.ConnectionError:
46+
except _bleio.ConnectionError: # pylint: disable=no-member
4347
print("disconnected")
4448
continue
4549
break

setup.py

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,48 @@
66
"""
77

88
from setuptools import setup, find_packages
9+
910
# To use a consistent encoding
1011
from codecs import open
1112
from os import path
1213

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

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

1920
setup(
20-
name='adafruit-circuitpython-ble-magic-light',
21-
21+
name="adafruit-circuitpython-ble-magic-light",
2222
use_scm_version=True,
23-
setup_requires=['setuptools_scm'],
24-
25-
description='BLE service for Magic Light BLE RGB bulbs',
23+
setup_requires=["setuptools_scm"],
24+
description="BLE service for Magic Light BLE RGB bulbs",
2625
long_description=long_description,
27-
long_description_content_type='text/x-rst',
28-
26+
long_description_content_type="text/x-rst",
2927
# The project's main homepage.
30-
url='https://github.com/adafruit/Adafruit_CircuitPython_BLE_Magic_Light',
31-
28+
url="https://github.com/adafruit/Adafruit_CircuitPython_BLE_Magic_Light",
3229
# Author details
33-
author='Adafruit Industries',
34-
author_email='circuitpython@adafruit.com',
35-
36-
install_requires=[
37-
'Adafruit-Blinka',
38-
'adafruit-circuitpython-ble'
39-
],
40-
30+
author="Adafruit Industries",
31+
author_email="circuitpython@adafruit.com",
32+
install_requires=["Adafruit-Blinka", "adafruit-circuitpython-ble"],
4133
# Choose your license
42-
license='MIT',
43-
34+
license="MIT",
4435
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
4536
classifiers=[
46-
'Development Status :: 3 - Alpha',
47-
'Intended Audience :: Developers',
48-
'Topic :: Software Development :: Libraries',
49-
'Topic :: System :: Hardware',
50-
'License :: OSI Approved :: MIT License',
51-
'Programming Language :: Python :: 3',
52-
'Programming Language :: Python :: 3.4',
53-
'Programming Language :: Python :: 3.5',
37+
"Development Status :: 3 - Alpha",
38+
"Intended Audience :: Developers",
39+
"Topic :: Software Development :: Libraries",
40+
"Topic :: System :: Hardware",
41+
"License :: OSI Approved :: MIT License",
42+
"Programming Language :: Python :: 3",
43+
"Programming Language :: Python :: 3.4",
44+
"Programming Language :: Python :: 3.5",
5445
],
55-
5646
# What does your project relate to?
57-
keywords='adafruit blinka circuitpython micropython ble_magic_light ble rgb',
58-
47+
keywords="adafruit blinka circuitpython micropython ble_magic_light ble rgb",
5948
# You can just specify the packages manually here if your project is
6049
# simple. Or you can use find_packages().
6150
# TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
6251
# CHANGE `py_modules=['...']` TO `packages=['...']`
63-
py_modules=['adafruit_ble_magic_light'],
52+
py_modules=["adafruit_ble_magic_light"],
6453
)

0 commit comments

Comments
 (0)