Skip to content

Commit 57ca5d7

Browse files
authored
Merge pull request #13 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents f42ae76 + 1af5e2f commit 57ca5d7

File tree

5 files changed

+103
-90
lines changed

5 files changed

+103
-90
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_mcp4725.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class MCP4725:
6363
:param int address: The address of the device if set differently from the default.
6464
"""
6565

66-
6766
# Global buffer to prevent allocations and heap fragmentation.
6867
# Note this is not thread-safe or re-entrant by design!
6968
_BUFFER = bytearray(3)
@@ -92,7 +91,7 @@ def _read(self):
9291
# Read 3 bytes from device.
9392
with self._i2c as i2c:
9493
i2c.readinto(self._BUFFER)
95-
# Grab the DAC value from last two bytes.
94+
# Grab the DAC value from last two bytes.
9695
dac_high = self._BUFFER[1]
9796
dac_low = self._BUFFER[2] >> 4
9897
# Reconstruct 12-bit value and return it.
@@ -134,7 +133,7 @@ def raw_value(self, val):
134133
def normalized_value(self):
135134
"""The DAC value as a floating point number in the range 0.0 to 1.0.
136135
"""
137-
return self._read()/4095.0
136+
return self._read() / 4095.0
138137

139138
@normalized_value.setter
140139
def normalized_value(self, val):

docs/conf.py

Lines changed: 68 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,55 @@
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 = ["micropython"]
2223

23-
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)}
24+
intersphinx_mapping = {
25+
"python": ("https://docs.python.org/3.4", None),
26+
"BusDevice": (
27+
"https://circuitpython.readthedocs.io/projects/busdevice/en/latest/",
28+
None,
29+
),
30+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
31+
}
2432

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

28-
source_suffix = '.rst'
36+
source_suffix = ".rst"
2937

3038
# The master toctree document.
31-
master_doc = 'index'
39+
master_doc = "index"
3240

3341
# General information about the project.
34-
project = u'Adafruit MCP4725 Library'
35-
copyright = u'2017 Tony DiCola'
36-
author = u'Tony DiCola'
42+
project = u"Adafruit MCP4725 Library"
43+
copyright = u"2017 Tony DiCola"
44+
author = u"Tony DiCola"
3745

3846
# The version info for the project you're documenting, acts as replacement for
3947
# |version| and |release|, also used in various other places throughout the
4048
# built documents.
4149
#
4250
# The short X.Y version.
43-
version = u'1.0'
51+
version = u"1.0"
4452
# The full version, including alpha/beta/rc tags.
45-
release = u'1.0'
53+
release = u"1.0"
4654

4755
# The language for content autogenerated by Sphinx. Refer to documentation
4856
# for a list of supported languages.
@@ -54,7 +62,7 @@
5462
# List of patterns, relative to source directory, that match files and
5563
# directories to ignore when looking for source files.
5664
# 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']
65+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]
5866

5967
# The reST default role (used for this markup: `text`) to use for all
6068
# documents.
@@ -66,7 +74,7 @@
6674
add_function_parentheses = True
6775

6876
# The name of the Pygments (syntax highlighting) style to use.
69-
pygments_style = 'sphinx'
77+
pygments_style = "sphinx"
7078

7179
# If true, `todo` and `todoList` produce output, else they produce nothing.
7280
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 = 'AdafruitMcp4725Librarydoc'
117+
htmlhelp_basename = "AdafruitMcp4725Librarydoc"
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, 'AdafruitMCP4725Library.tex', u'AdafruitMCP4725 Library Documentation',
135-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitMCP4725Library.tex",
143+
u"AdafruitMCP4725 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, 'AdafruitMCP4725library', u'Adafruit MCP4725 Library Documentation',
144-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitMCP4725library",
157+
u"Adafruit MCP4725 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, 'AdafruitMCP4725Library', u'Adafruit MCP4725 Library Documentation',
154-
author, 'AdafruitMCP4725Library', 'One line description of project.',
155-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitMCP4725Library",
172+
u"Adafruit MCP4725 Library Documentation",
173+
author,
174+
"AdafruitMCP4725Library",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
156178
]

examples/mcp4725_simpletest.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313
# Initialize MCP4725.
1414
dac = adafruit_mcp4725.MCP4725(i2c)
1515
# Optionally you can specify a different addres if you override the A0 pin.
16-
#amp = adafruit_max9744.MAX9744(i2c, address=0x63)
16+
# amp = adafruit_max9744.MAX9744(i2c, address=0x63)
1717

1818
# There are a three ways to set the DAC output, you can use any of these:
1919
dac.value = 65535 # Use the value property with a 16-bit number just like
20-
# the AnalogOut class. Note the MCP4725 is only a 12-bit
21-
# DAC so quantization errors will occur. The range of
22-
# values is 0 (minimum/ground) to 65535 (maximum/Vout).
20+
# the AnalogOut class. Note the MCP4725 is only a 12-bit
21+
# DAC so quantization errors will occur. The range of
22+
# values is 0 (minimum/ground) to 65535 (maximum/Vout).
2323

2424
dac.raw_value = 4095 # Use the raw_value property to directly read and write
25-
# the 12-bit DAC value. The range of values is
26-
# 0 (minimum/ground) to 4095 (maximum/Vout).
25+
# the 12-bit DAC value. The range of values is
26+
# 0 (minimum/ground) to 4095 (maximum/Vout).
2727

2828
dac.normalized_value = 1.0 # Use the normalized_value property to set the
29-
# output with a floating point value in the range
30-
# 0 to 1.0 where 0 is minimum/ground and 1.0 is
31-
# maximum/Vout.
29+
# output with a floating point value in the range
30+
# 0 to 1.0 where 0 is minimum/ground and 1.0 is
31+
# maximum/Vout.
3232

3333
# Main loop will go up and down through the range of DAC values forever.
3434
while True:
3535
# Go up the 12-bit raw range.
36-
print('Going up 0-3.3V...')
36+
print("Going up 0-3.3V...")
3737
for i in range(4095):
3838
dac.raw_value = i
3939
# Go back down the 12-bit raw range.
40-
print('Going down 3.3-0V...')
40+
print("Going down 3.3-0V...")
4141
for i in range(4095, -1, -1):
4242
dac.raw_value = i

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-mcp4725',
22-
22+
name="adafruit-circuitpython-mcp4725",
2323
use_scm_version=True,
24-
setup_requires=['setuptools_scm'],
25-
26-
description='CircuitPython library for MCP4725 digital to analog converter.',
24+
setup_requires=["setuptools_scm"],
25+
description="CircuitPython library for MCP4725 digital to analog converter.",
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_MCP4725',
32-
29+
url="https://github.com/adafruit/Adafruit_CircuitPython_MCP4725",
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 mcp4725 digital analog converter dac hardware micropython circuitpython',
56-
48+
keywords="adafruit mcp4725 digital analog converter dac 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_mcp4725'],
51+
py_modules=["adafruit_mcp4725"],
6052
)

0 commit comments

Comments
 (0)