Skip to content

Commit 1bc5b0b

Browse files
authored
Merge pull request #6 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents c2e3d4d + 255a106 commit 1bc5b0b

File tree

5 files changed

+104
-88
lines changed

5 files changed

+104
-88
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_ble_heart_rate.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454

5555
HeartRateMeasurementValues = namedtuple(
5656
"HeartRateMeasurementValues",
57-
("heart_rate", "contact", "energy_expended", "rr_intervals"))
57+
("heart_rate", "contact", "energy_expended", "rr_intervals"),
58+
)
5859
"""Namedtuple for measurement values.
5960
6061
.. py:attribute:: HeartRateMeasurementValues.heart_rate
@@ -83,8 +84,10 @@
8384
bpm = svc.measurement_values.heart_rate
8485
"""
8586

87+
8688
class _HeartRateMeasurement(ComplexCharacteristic):
8789
"""Notify-only characteristic of streaming heart rate data."""
90+
8891
uuid = StandardUUID(0x2A37)
8992

9093
def __init__(self):
@@ -123,18 +126,22 @@ class HeartRateService(Service):
123126
# Mandatory for Heart Rate Service
124127
heart_rate_measurement = _HeartRateMeasurement()
125128
# Optional for Heart Rate Service.
126-
body_sensor_location = Uint8Characteristic(uuid=StandardUUID(0x2A38),
127-
properties=Characteristic.READ)
129+
body_sensor_location = Uint8Characteristic(
130+
uuid=StandardUUID(0x2A38), properties=Characteristic.READ
131+
)
128132

129133
# Mandatory only if Energy Expended features is supported.
130-
heart_rate_control_point = Uint8Characteristic(uuid=StandardUUID(0x2A39),
131-
properties=Characteristic.WRITE)
134+
heart_rate_control_point = Uint8Characteristic(
135+
uuid=StandardUUID(0x2A39), properties=Characteristic.WRITE
136+
)
132137

133138
_BODY_LOCATIONS = ("Other", "Chest", "Wrist", "Finger", "Hand", "Ear Lobe", "Foot")
134139

135140
def __init__(self, service=None):
136141
super().__init__(service=service)
137-
self._measurement_buf = bytearray(self.heart_rate_measurement.packet_size)
142+
self._measurement_buf = bytearray(
143+
self.heart_rate_measurement.packet_size # pylint: disable=no-member
144+
)
138145

139146
@property
140147
def measurement_values(self):
@@ -144,7 +151,9 @@ def measurement_values(self):
144151
Return ``None`` if no packet has been read yet.
145152
"""
146153
buf = self._measurement_buf
147-
packet_length = self.heart_rate_measurement.readinto(buf)
154+
packet_length = self.heart_rate_measurement.readinto( # pylint: disable=no-member
155+
buf
156+
)
148157
if packet_length == 0:
149158
return None
150159
flags = buf[0]

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 = ["digitalio", "busio"]
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_Heart_Rate Library'
38-
copyright = u'2020 Adafruit Industries'
39-
author = u'Adafruit Industries'
41+
project = u"Adafruit BLE_Heart_Rate Library"
42+
copyright = u"2020 Adafruit Industries"
43+
author = u"Adafruit Industries"
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 = u"1.0"
4751
# The full version, including alpha/beta/rc tags.
48-
release = u'1.0'
52+
release = u"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_heart_rateLibrarydoc'
117+
htmlhelp_basename = "AdafruitBle_heart_rateLibrarydoc"
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_Heart_RateLibrary.tex', u'AdafruitBLE_Heart_Rate Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitBLE_Heart_RateLibrary.tex",
143+
u"AdafruitBLE_Heart_Rate 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_Heart_Ratelibrary', u'Adafruit BLE_Heart_Rate Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitBLE_Heart_Ratelibrary",
157+
u"Adafruit BLE_Heart_Rate 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_Heart_RateLibrary', u'Adafruit BLE_Heart_Rate Library Documentation',
158-
author, 'AdafruitBLE_Heart_RateLibrary', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitBLE_Heart_RateLibrary",
172+
u"Adafruit BLE_Heart_Rate Library Documentation",
173+
author,
174+
"AdafruitBLE_Heart_RateLibrary",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/ble_heart_rate_simpletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from adafruit_ble_heart_rate import HeartRateService
1212

1313
# PyLint can't find BLERadio for some reason so special case it here.
14-
ble = adafruit_ble.BLERadio() # pylint: disable=no-member
14+
ble = adafruit_ble.BLERadio() # pylint: disable=no-member
1515

1616
hr_connection = None
1717
# Start with a fresh connection.

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-heart-rate',
21-
21+
name="adafruit-circuitpython-ble-heart-rate",
2222
use_scm_version=True,
23-
setup_requires=['setuptools_scm'],
24-
25-
description='BLE Heart Rate Service',
23+
setup_requires=["setuptools_scm"],
24+
description="BLE Heart Rate Service",
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_Heart_Rate',
31-
28+
url="https://github.com/adafruit/Adafruit_CircuitPython_BLE_Heart_Rate",
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_heart_rate ble heart rate',
58-
47+
keywords="adafruit blinka circuitpython micropython ble_heart_rate ble heart rate",
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_heart_rate'],
52+
py_modules=["adafruit_ble_heart_rate"],
6453
)

0 commit comments

Comments
 (0)