Skip to content

Commit bf08fa1

Browse files
authored
Merge pull request #19 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents 55b9d27 + 6a103b2 commit bf08fa1

File tree

4 files changed

+98
-86
lines changed

4 files changed

+98
-86
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_ds2413.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,18 @@
3232
__version__ = "0.0.0-auto.0"
3333
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DS2413.git"
3434

35-
from adafruit_onewire.device import OneWireDevice
3635
from micropython import const
36+
from adafruit_onewire.device import OneWireDevice
3737

38-
_DS2413_ACCESS_READ = b'\xF5'
39-
_DS2413_ACCESS_WRITE = b'\x5A'
40-
_DS2413_ACK_SUCCESS = b'\xAA'
41-
_DS2413_ACK_ERROR = b'\xFF'
38+
_DS2413_ACCESS_READ = b"\xF5"
39+
_DS2413_ACCESS_WRITE = b"\x5A"
40+
_DS2413_ACK_SUCCESS = b"\xAA"
41+
_DS2413_ACK_ERROR = b"\xFF"
4242
INPUT = const(0)
4343
OUTPUT = const(1)
4444

45-
class DS2413Pin():
45+
46+
class DS2413Pin:
4647
"""Class which provides interface to single DS2413 GPIO pin."""
4748

4849
def __init__(self, number, host, direction=OUTPUT):
@@ -51,7 +52,7 @@ def __init__(self, number, host, direction=OUTPUT):
5152
self._number = number
5253
self._host = host
5354
self._mask = 1 << (number * 2)
54-
self._direction = None # create it, and then...
55+
self._direction = None # create it, and then...
5556
self.direction = direction # set it through setter
5657

5758
@property
@@ -96,7 +97,8 @@ def value(self, state):
9697
new |= 1 << self._number
9798
self._host.pio_state = new
9899

99-
class DS2413():
100+
101+
class DS2413:
100102
"""Class which provides interface to DS2413 GPIO breakout."""
101103

102104
def __init__(self, bus, address):
@@ -107,7 +109,7 @@ def __init__(self, bus, address):
107109
self._IOA = None
108110
self._IOB = None
109111
else:
110-
raise RuntimeError('Incorrect family code in device address.')
112+
raise RuntimeError("Incorrect family code in device address.")
111113

112114
@property
113115
def IOA(self):
@@ -148,4 +150,4 @@ def _write_latches(self, value):
148150
dev.write(self._buf, end=2)
149151
dev.readinto(self._buf, end=1)
150152
if not self._buf[0] == ord(_DS2413_ACK_SUCCESS):
151-
raise RuntimeError('ACK failure.')
153+
raise RuntimeError("ACK failure.")

docs/conf.py

+64-46
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,51 @@
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.viewcode',
14+
"sphinx.ext.autodoc",
15+
"sphinx.ext.intersphinx",
16+
"sphinx.ext.viewcode",
1617
]
1718

1819
# Uncomment the below if you use native CircuitPython modules such as
1920
# digitalio, micropython and busio. List the modules you use. Without it, the
2021
# autodoc module docs will fail to generate with a warning.
2122
# autodoc_mock_imports = ["adafruit_onewire", "micropython"]
2223

23-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
24+
intersphinx_mapping = {
25+
"python": ("https://docs.python.org/3.4", None),
26+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
27+
}
2428

2529
# Add any paths that contain templates here, relative to this directory.
26-
templates_path = ['_templates']
30+
templates_path = ["_templates"]
2731

28-
source_suffix = '.rst'
32+
source_suffix = ".rst"
2933

3034
# The master toctree document.
31-
master_doc = 'index'
35+
master_doc = "index"
3236

3337
# General information about the project.
34-
project = u'Adafruit DS2413 Library'
35-
copyright = u'2017 Carter Nelson'
36-
author = u'Carter Nelson'
38+
project = u"Adafruit DS2413 Library"
39+
copyright = u"2017 Carter Nelson"
40+
author = u"Carter Nelson"
3741

3842
# The version info for the project you're documenting, acts as replacement for
3943
# |version| and |release|, also used in various other places throughout the
4044
# built documents.
4145
#
4246
# The short X.Y version.
43-
version = u'1.0'
47+
version = u"1.0"
4448
# The full version, including alpha/beta/rc tags.
45-
release = u'1.0'
49+
release = u"1.0"
4650

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

5963
# The reST default role (used for this markup: `text`) to use for all
6064
# documents.
@@ -66,7 +70,7 @@
6670
add_function_parentheses = True
6771

6872
# The name of the Pygments (syntax highlighting) style to use.
69-
pygments_style = 'sphinx'
73+
pygments_style = "sphinx"
7074

7175
# If true, `todo` and `todoList` produce output, else they produce nothing.
7276
todo_include_todos = False
@@ -80,68 +84,76 @@
8084
# The theme to use for HTML and HTML Help pages. See the documentation for
8185
# a list of builtin themes.
8286
#
83-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
87+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
8488

8589
if not on_rtd: # only import and set the theme if we're building docs locally
8690
try:
8791
import sphinx_rtd_theme
88-
html_theme = 'sphinx_rtd_theme'
89-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
92+
93+
html_theme = "sphinx_rtd_theme"
94+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
9095
except:
91-
html_theme = 'default'
92-
html_theme_path = ['.']
96+
html_theme = "default"
97+
html_theme_path = ["."]
9398
else:
94-
html_theme_path = ['.']
99+
html_theme_path = ["."]
95100

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

101106
# The name of an image file (relative to this directory) to use as a favicon of
102107
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
103108
# pixels large.
104109
#
105-
html_favicon = '_static/favicon.ico'
110+
html_favicon = "_static/favicon.ico"
106111

107112
# Output file base name for HTML help builder.
108-
htmlhelp_basename = 'AdafruitDs2413Librarydoc'
113+
htmlhelp_basename = "AdafruitDs2413Librarydoc"
109114

110115
# -- Options for LaTeX output ---------------------------------------------
111116

112117
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',
118+
# The paper size ('letterpaper' or 'a4paper').
119+
#
120+
# 'papersize': 'letterpaper',
121+
# The font size ('10pt', '11pt' or '12pt').
122+
#
123+
# 'pointsize': '10pt',
124+
# Additional stuff for the LaTeX preamble.
125+
#
126+
# 'preamble': '',
127+
# Latex figure (float) alignment
128+
#
129+
# 'figure_align': 'htbp',
128130
}
129131

130132
# Grouping the document tree into LaTeX files. List of tuples
131133
# (source start file, target name, title,
132134
# author, documentclass [howto, manual, or own class]).
133135
latex_documents = [
134-
(master_doc, 'AdafruitDS2413Library.tex', u'AdafruitDS2413 Library Documentation',
135-
author, 'manual'),
136+
(
137+
master_doc,
138+
"AdafruitDS2413Library.tex",
139+
u"AdafruitDS2413 Library Documentation",
140+
author,
141+
"manual",
142+
),
136143
]
137144

138145
# -- Options for manual page output ---------------------------------------
139146

140147
# One entry per manual page. List of tuples
141148
# (source start file, name, description, authors, manual section).
142149
man_pages = [
143-
(master_doc, 'AdafruitDS2413library', u'Adafruit DS2413 Library Documentation',
144-
[author], 1)
150+
(
151+
master_doc,
152+
"AdafruitDS2413library",
153+
u"Adafruit DS2413 Library Documentation",
154+
[author],
155+
1,
156+
)
145157
]
146158

147159
# -- Options for Texinfo output -------------------------------------------
@@ -150,7 +162,13 @@
150162
# (source start file, target name, title, author,
151163
# dir menu entry, description, category)
152164
texinfo_documents = [
153-
(master_doc, 'AdafruitDS2413Library', u'Adafruit DS2413 Library Documentation',
154-
author, 'AdafruitDS2413Library', 'One line description of project.',
155-
'Miscellaneous'),
165+
(
166+
master_doc,
167+
"AdafruitDS2413Library",
168+
u"Adafruit DS2413 Library Documentation",
169+
author,
170+
"AdafruitDS2413Library",
171+
"One line description of project.",
172+
"Miscellaneous",
173+
),
156174
]

setup.py

+21-29
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-ds2413',
22-
22+
name="adafruit-circuitpython-ds2413",
2323
use_scm_version=True,
24-
setup_requires=['setuptools_scm'],
25-
26-
description='CircuitPython library for DS2413 1-Wire Dual Channel Addressable Switch.',
24+
setup_requires=["setuptools_scm"],
25+
description="CircuitPython library for DS2413 1-Wire Dual Channel Addressable Switch.",
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_DS2413',
32-
29+
url="https://github.com/adafruit/Adafruit_CircuitPython_DS2413",
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 haptic motor controller buzzer vibration breakout hardware micropython circuitpython',
56-
48+
keywords="adafruit haptic motor controller buzzer vibration breakout 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_ds2413'],
51+
py_modules=["adafruit_ds2413"],
6052
)

0 commit comments

Comments
 (0)