From 592140fd509968357f89d5f61216238dca738a29 Mon Sep 17 00:00:00 2001 From: dherrada Date: Thu, 12 Mar 2020 19:30:56 -0400 Subject: [PATCH] Ran black, updated to pylint 2.x --- .github/workflows/build.yml | 2 +- adafruit_mprls.py | 18 ++++-- docs/conf.py | 116 +++++++++++++++++++++--------------- setup.py | 51 +++++++--------- 4 files changed, 104 insertions(+), 83 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fff3aa9..1dad804 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/adafruit_mprls.py b/adafruit_mprls.py index f9ae636..29596ca 100644 --- a/adafruit_mprls.py +++ b/adafruit_mprls.py @@ -56,6 +56,7 @@ _MPRLS_DEFAULT_ADDR = const(0x18) # pylint: enable=bad-whitespace + class MPRLS: """ Driver base for the MPRLS pressure sensor @@ -67,8 +68,16 @@ class MPRLS: :param float psi_max: The maximum pressure in PSI, defaults to 25 """ - def __init__(self, i2c_bus, *, addr=_MPRLS_DEFAULT_ADDR, - reset_pin=None, eoc_pin=None, psi_min=0, psi_max=25): + def __init__( + self, + i2c_bus, + *, + addr=_MPRLS_DEFAULT_ADDR, + reset_pin=None, + eoc_pin=None, + psi_min=0, + psi_max=25 + ): # Init I2C self._i2c = I2CDevice(i2c_bus, addr) self._buffer = bytearray(4) @@ -80,7 +89,7 @@ def __init__(self, i2c_bus, *, addr=_MPRLS_DEFAULT_ADDR, reset_pin.value = False time.sleep(0.01) reset_pin.value = True - time.sleep(0.005) # Start up timing + time.sleep(0.005) # Start up timing # Optional end-of-conversion pin self._eoc = eoc_pin @@ -98,7 +107,6 @@ def pressure(self): """The measured pressure, in hPa""" return self._read_data() - def _read_data(self): """Read the status & 24-bit data reading""" self._buffer[0] = 0xAA @@ -129,7 +137,7 @@ def _read_data(self): # All is good, calculate the PSI and convert to hPA raw_psi = (self._buffer[1] << 16) | (self._buffer[2] << 8) | self._buffer[3] # use the 10-90 calibration curve - psi = (raw_psi - 0x19999A) * (self._psimax-self._psimin) + psi = (raw_psi - 0x19999A) * (self._psimax - self._psimin) psi /= 0xE66666 - 0x19999A psi += self._psimin # convert PSI to hPA diff --git a/docs/conf.py b/docs/conf.py index 09507db..b952cf6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -2,7 +2,8 @@ import os import sys -sys.path.insert(0, os.path.abspath('..')) + +sys.path.insert(0, os.path.abspath("..")) # -- General configuration ------------------------------------------------ @@ -10,35 +11,42 @@ # 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", ] -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)} +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), +} # 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 MPRLS Library' -copyright = u'2018 ladyada' -author = u'ladyada' +project = u"Adafruit MPRLS Library" +copyright = u"2018 ladyada" +author = u"ladyada" # 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. @@ -50,7 +58,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. @@ -62,7 +70,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 @@ -77,59 +85,62 @@ # 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 = 'AdafruitMprlsLibrarydoc' +htmlhelp_basename = "AdafruitMprlsLibrarydoc" # -- 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, 'AdafruitMPRLSLibrary.tex', u'AdafruitMPRLS Library Documentation', - author, 'manual'), + ( + master_doc, + "AdafruitMPRLSLibrary.tex", + u"AdafruitMPRLS Library Documentation", + author, + "manual", + ), ] # -- Options for manual page output --------------------------------------- @@ -137,8 +148,13 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'AdafruitMPRLSlibrary', u'Adafruit MPRLS Library Documentation', - [author], 1) + ( + master_doc, + "AdafruitMPRLSlibrary", + u"Adafruit MPRLS Library Documentation", + [author], + 1, + ) ] # -- Options for Texinfo output ------------------------------------------- @@ -147,7 +163,13 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'AdafruitMPRLSLibrary', u'Adafruit MPRLS Library Documentation', - author, 'AdafruitMPRLSLibrary', 'One line description of project.', - 'Miscellaneous'), + ( + master_doc, + "AdafruitMPRLSLibrary", + u"Adafruit MPRLS Library Documentation", + author, + "AdafruitMPRLSLibrary", + "One line description of project.", + "Miscellaneous", + ), ] diff --git a/setup.py b/setup.py index be0c07a..86814e2 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ # Always prefer setuptools over distutils from setuptools import setup, find_packages + # To use a consistent encoding from codecs import open from os import path @@ -14,48 +15,38 @@ 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-mprls', - + name="adafruit-circuitpython-mprls", use_scm_version=True, - setup_requires=['setuptools_scm'], - - description='CircuitPython library to support Honeywell MPRLS digital pressure sensors.', - + setup_requires=["setuptools_scm"], + description="CircuitPython library to support Honeywell MPRLS digital pressure sensors.", 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_MPRLS', - + url="https://github.com/adafruit/Adafruit_CircuitPython_MPRLS", # 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 mprls hardware pressure honeywell micropython circuitpython', - + keywords="adafruit mprls hardware pressure honeywell micropython circuitpython", # You can just specify the packages manually here if your project is # simple. Or you can use find_packages(). - py_modules=['adafruit_mprls'], + py_modules=["adafruit_mprls"], )