Skip to content

Commit

Permalink
Merge pull request #7 from adafruit/pylint-update
Browse files Browse the repository at this point in the history
Ran black, updated to pylint 2.x
  • Loading branch information
kattni committed Mar 16, 2020
2 parents 4b2e1a3 + 41b43eb commit e44a966
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 86 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
source actions-ci/install.sh
- name: Pip install pylint, black, & Sphinx
run: |
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
- name: Library version
run: git describe --dirty --always --tags
- name: PyLint
Expand Down
16 changes: 9 additions & 7 deletions adafruit_mpl115a2.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MPL115A2.git"

# pylint: disable=bad-whitespace
_MPL115A2_ADDRESS = const(0x60)
_MPL115A2_REGISTER_PRESSURE_MSB = const(0x00)
_MPL115A2_REGISTER_A0_COEFF_MSB = const(0x04)
_MPL115A2_REGISTER_STARTCONVERSION = const(0x12)
_MPL115A2_ADDRESS = const(0x60)
_MPL115A2_REGISTER_PRESSURE_MSB = const(0x00)
_MPL115A2_REGISTER_A0_COEFF_MSB = const(0x04)
_MPL115A2_REGISTER_STARTCONVERSION = const(0x12)
# pylint: enable=bad-whitespace


class MPL115A2:
"""Driver for MPL115A2 I2C barometric pressure / temperature sensor."""

def __init__(self, i2c, address=_MPL115A2_ADDRESS):
self._i2c = i2c_device.I2CDevice(i2c, address)
self._buf = bytearray(4)
Expand All @@ -66,7 +68,7 @@ def __init__(self, i2c, address=_MPL115A2_ADDRESS):
@property
def pressure(self):
"""The pressure in hPa."""
return self._read()[0]*10
return self._read()[0] * 10

@property
def temperature(self):
Expand Down Expand Up @@ -94,7 +96,7 @@ def _read(self):
self._buf[1] = 0x00 # why? see datasheet, pg. 9, fig. 4
with self._i2c as i2c:
i2c.write(self._buf, end=2)
time.sleep(0.005) # see datasheet, Conversion Time = 3ms MAX
time.sleep(0.005) # see datasheet, Conversion Time = 3ms MAX
self._buf[0] = _MPL115A2_REGISTER_PRESSURE_MSB
i2c.write(self._buf, end=1)
i2c.readinto(self._buf)
Expand All @@ -104,7 +106,7 @@ def _read(self):
# see datasheet pg. 6, eqn. 1, result in counts
pressure = self._a0 + (self._b1 + self._c12 * temp) * pressure + self._b2 * temp
# see datasheet pg. 6, eqn. 2, result in kPa
pressure = (65/1023) * pressure + 50
pressure = (65 / 1023) * pressure + 50
# stolen from arduino driver, result in deg C
temp = (temp - 498) / -5.35 + 25
return pressure, temp
120 changes: 73 additions & 47 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@

import os
import sys
sys.path.insert(0, os.path.abspath('..'))

sys.path.insert(0, os.path.abspath(".."))

# -- General configuration ------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.napoleon',
'sphinx.ext.todo',
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"sphinx.ext.todo",
]

# TODO: Please Read!
Expand All @@ -23,29 +24,40 @@
# autodoc_mock_imports = ["digitalio", "busio"]


intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'Register': ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
intersphinx_mapping = {
"python": ("https://docs.python.org/3.4", None),
"BusDevice": (
"https://circuitpython.readthedocs.io/projects/busdevice/en/latest/",
None,
),
"Register": (
"https://circuitpython.readthedocs.io/projects/register/en/latest/",
None,
),
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
}

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

source_suffix = '.rst'
source_suffix = ".rst"

# The master toctree document.
master_doc = 'index'
master_doc = "index"

# General information about the project.
project = u'Adafruit MPL115A2 Library'
copyright = u'2018 Carter Nelson'
author = u'Carter Nelson'
project = u"Adafruit MPL115A2 Library"
copyright = u"2018 Carter Nelson"
author = u"Carter Nelson"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'1.0'
version = u"1.0"
# The full version, including alpha/beta/rc tags.
release = u'1.0'
release = u"1.0"

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

# The reST default role (used for this markup: `text`) to use for all
# documents.
Expand All @@ -69,7 +81,7 @@
add_function_parentheses = True

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"

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

if not on_rtd: # only import and set the theme if we're building docs locally
try:
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']

html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
except:
html_theme = 'default'
html_theme_path = ['.']
html_theme = "default"
html_theme_path = ["."]
else:
html_theme_path = ['.']
html_theme_path = ["."]

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

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

# Output file base name for HTML help builder.
htmlhelp_basename = 'AdafruitMpl115a2Librarydoc'
htmlhelp_basename = "AdafruitMpl115a2Librarydoc"

# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',
# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'AdafruitMPL115A2Library.tex', u'AdafruitMPL115A2 Library Documentation',
author, 'manual'),
(
master_doc,
"AdafruitMPL115A2Library.tex",
u"AdafruitMPL115A2 Library Documentation",
author,
"manual",
),
]

# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'AdafruitMPL115A2library', u'Adafruit MPL115A2 Library Documentation',
[author], 1)
(
master_doc,
"AdafruitMPL115A2library",
u"Adafruit MPL115A2 Library Documentation",
[author],
1,
)
]

# -- Options for Texinfo output -------------------------------------------
Expand All @@ -154,7 +174,13 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'AdafruitMPL115A2Library', u'Adafruit MPL115A2 Library Documentation',
author, 'AdafruitMPL115A2Library', 'One line description of project.',
'Miscellaneous'),
(
master_doc,
"AdafruitMPL115A2Library",
u"Adafruit MPL115A2 Library Documentation",
author,
"AdafruitMPL115A2Library",
"One line description of project.",
"Miscellaneous",
),
]
54 changes: 23 additions & 31 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,47 @@

# Always prefer setuptools over distutils
from setuptools import setup, find_packages

# To use a consistent encoding
from codecs import open
from os import path

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

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

setup(
name='adafruit-circuitpython-mpl115a2',

name="adafruit-circuitpython-mpl115a2",
use_scm_version=True,
setup_requires=['setuptools_scm'],

description='CircuitPython driver for MPL115A2 I2C Barometric Pressure/Temperature Sensor.',
setup_requires=["setuptools_scm"],
description="CircuitPython driver for MPL115A2 I2C Barometric Pressure/Temperature Sensor.",
long_description=long_description,
long_description_content_type='text/x-rst',

long_description_content_type="text/x-rst",
# The project's main homepage.
url='https://github.com/adafruit/Adafruit_CircuitPython_MPL115A2',

url="https://github.com/adafruit/Adafruit_CircuitPython_MPL115A2",
# Author details
author='Adafruit Industries',
author_email='circuitpython@adafruit.com',

install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'],

author="Adafruit Industries",
author_email="circuitpython@adafruit.com",
install_requires=["Adafruit-Blinka", "adafruit-circuitpython-busdevice"],
# Choose your license
license='MIT',

license="MIT",
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifiers=[
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries',
'Topic :: System :: Hardware',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
"Development Status :: 3 - Alpha",
"Intended Audience :: Developers",
"Topic :: Software Development :: Libraries",
"Topic :: System :: Hardware",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
],

# What does your project relate to?
keywords='adafruit i2c barometric pressure temperature '
'mpl115a2 hardware micropython circuitpython',

keywords="adafruit i2c barometric pressure temperature "
"mpl115a2 hardware micropython circuitpython",
# You can just specify the packages manually here if your project is
# simple. Or you can use find_packages().
py_modules=['adafruit_mpl115a2'],
)
py_modules=["adafruit_mpl115a2"],
)

0 comments on commit e44a966

Please sign in to comment.