Skip to content

Commit c7bce0d

Browse files
authored
Merge pull request #8 from adafruit/pylint-update
Pylint update
2 parents 0687029 + e150596 commit c7bce0d

File tree

5 files changed

+111
-96
lines changed

5 files changed

+111
-96
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 pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_dymoscale.py

+23-16
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
from pulseio import PulseIn
4242
from micropython import const
4343

44-
OUNCES = const(0x0B) # data in weight is in ounces
45-
GRAMS = const(0x02) # data in weight is in grams
44+
OUNCES = const(0x0B) # data in weight is in ounces
45+
GRAMS = const(0x02) # data in weight is in grams
4646
PULSE_WIDTH = 72.5
4747

4848
__version__ = "0.0.0-auto.0"
@@ -51,13 +51,16 @@
5151
# pylint: disable=too-few-public-methods
5252
class ScaleReading:
5353
"""Dymo Scale Data"""
54-
units = None # what units we're measuring
55-
stable = None # is the measurement stable?
56-
weight = None # the weight!
54+
55+
units = None # what units we're measuring
56+
stable = None # is the measurement stable?
57+
weight = None # the weight!
58+
5759

5860
class DYMOScale:
5961
"""Interface to a DYMO postal scale.
6062
"""
63+
6164
def __init__(self, data_pin, units_pin, timeout=1.0):
6265
"""Sets up a DYMO postal scale.
6366
:param ~pulseio.PulseIn data_pin: The data pin from the Dymo scale.
@@ -84,9 +87,9 @@ def toggle_unit_button(self, switch_units=False):
8487
:param bool switch_units: Simulates pressing the units button.
8588
"""
8689
toggle_times = 0
87-
if switch_units: # press the button once
90+
if switch_units: # press the button once
8891
toggle_amt = 2
89-
else: # toggle and preserve current unit state
92+
else: # toggle and preserve current unit state
9093
toggle_amt = 4
9194
while toggle_times < toggle_amt:
9295
self.units_pin.value ^= 1
@@ -103,34 +106,38 @@ def _read_pulse(self):
103106
self.dymo.resume()
104107
while len(self.dymo) < 35:
105108
if (time.monotonic() - timestamp) > self.timeout:
106-
raise RuntimeError("Timed out waiting for data - is the scale turned on?")
109+
raise RuntimeError(
110+
"Timed out waiting for data - is the scale turned on?"
111+
)
107112
self.dymo.pause()
108113

109114
def get_scale_data(self):
110115
"""Reads a pulse of SPI data and analyzes the resulting data.
111116
"""
112117
self._read_pulse()
113-
bits = [0] * 96 # there are 12 bytes = 96 bits of data
114-
bit_idx = 0 # we will count a bit at a time
115-
bit_val = False # first pulses will be LOW
118+
bits = [0] * 96 # there are 12 bytes = 96 bits of data
119+
bit_idx = 0 # we will count a bit at a time
120+
bit_val = False # first pulses will be LOW
116121
for i in range(len(self.dymo)):
117-
if self.dymo[i] == 65535: # check for the pulse between transmits
122+
if self.dymo[i] == 65535: # check for the pulse between transmits
118123
break
119-
num_bits = int(self.dymo[i] / PULSE_WIDTH + 0.5) # ~14KHz == ~7.5us per clock
124+
num_bits = int(
125+
self.dymo[i] / PULSE_WIDTH + 0.5
126+
) # ~14KHz == ~7.5us per clock
120127
bit = 0
121128
while bit < num_bits:
122129
bits[bit_idx] = bit_val
123130
bit_idx += 1
124-
if bit_idx == 96: # we have read all the data we wanted
131+
if bit_idx == 96: # we have read all the data we wanted
125132
break
126133
bit += 1
127134
bit_val = not bit_val
128-
data_bytes = [0] * 12 # alllocate data array
135+
data_bytes = [0] * 12 # alllocate data array
129136
for byte_n in range(12):
130137
the_byte = 0
131138
for bit_n in range(8):
132139
the_byte <<= 1
133-
the_byte |= bits[byte_n*8 + bit_n]
140+
the_byte |= bits[byte_n * 8 + bit_n]
134141
data_bytes[byte_n] = the_byte
135142
# do some very basic data checking
136143
if data_bytes[0] != 3 and data_bytes[0] != 2:

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

examples/dymoscale_simpletest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
print(text)
1818
# to avoid sleep mode, toggle the units pin every 2 mins.
1919
if (time.monotonic() - time_stamp) > 120:
20-
print('toggling units button...')
20+
print("toggling units button...")
2121
dymo.toggle_unit_button()
2222
# reset the time
2323
time_stamp = time.monotonic()

setup.py

+21-31
Original file line numberDiff line numberDiff line change
@@ -6,58 +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-dymoscale',
21-
21+
name="adafruit-circuitpython-dymoscale",
2222
use_scm_version=True,
23-
setup_requires=['setuptools_scm'],
24-
25-
description='CircuitPython interface for DYMO scales.',
23+
setup_requires=["setuptools_scm"],
24+
description="CircuitPython interface for DYMO scales.",
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_DymoScale',
31-
28+
url="https://github.com/adafruit/Adafruit_CircuitPython_DymoScale",
3229
# Author details
33-
author='Adafruit Industries',
34-
author_email='[email protected]',
35-
36-
install_requires=[
37-
'Adafruit-Blinka'
38-
],
39-
30+
author="Adafruit Industries",
31+
author_email="[email protected]",
32+
install_requires=["Adafruit-Blinka"],
4033
# Choose your license
41-
license='MIT',
42-
34+
license="MIT",
4335
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
4436
classifiers=[
45-
'Development Status :: 3 - Alpha',
46-
'Intended Audience :: Developers',
47-
'Topic :: Software Development :: Libraries',
48-
'Topic :: System :: Hardware',
49-
'License :: OSI Approved :: MIT License',
50-
'Programming Language :: Python :: 3',
51-
'Programming Language :: Python :: 3.4',
52-
'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",
5345
],
54-
5546
# What does your project relate to?
56-
keywords='adafruit blinka circuitpython micropython dymoscale dymo scale',
57-
47+
keywords="adafruit blinka circuitpython micropython dymoscale dymo scale",
5848
# You can just specify the packages manually here if your project is
5949
# simple. Or you can use find_packages().
6050
# TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
6151
# CHANGE `py_modules=['...']` TO `packages=['...']`
62-
py_modules=['adafruit_dymoscale'],
52+
py_modules=["adafruit_dymoscale"],
6353
)

0 commit comments

Comments
 (0)