Merge pull request #11 from adafruit/pylint-update

Ran black, updated to pylint 2.x

Author: kattni

.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

adafruit_vcnl4010.py

@@ -53,29 +53,29 @@
 
 # pylint: disable=bad-whitespace
 # Internal constants:
-_VCNL4010_I2CADDR_DEFAULT   = const(0x13)
-_VCNL4010_COMMAND           = const(0x80)
-_VCNL4010_PRODUCTID         = const(0x81)
-_VCNL4010_PROXRATE          = const(0x82)
-_VCNL4010_IRLED             = const(0x83)
-_VCNL4010_AMBIENTPARAMETER  = const(0x84)
-_VCNL4010_AMBIENTDATA       = const(0x85)
-_VCNL4010_PROXIMITYDATA     = const(0x87)
-_VCNL4010_INTCONTROL        = const(0x89)
-_VCNL4010_PROXINITYADJUST   = const(0x8A)
-_VCNL4010_INTSTAT           = const(0x8E)
-_VCNL4010_MODTIMING         = const(0x8F)
-_VCNL4010_MEASUREAMBIENT    = const(0x10)
-_VCNL4010_MEASUREPROXIMITY  = const(0x08)
-_VCNL4010_AMBIENTREADY      = const(0x40)
-_VCNL4010_PROXIMITYREADY    = const(0x20)
+_VCNL4010_I2CADDR_DEFAULT = const(0x13)
+_VCNL4010_COMMAND = const(0x80)
+_VCNL4010_PRODUCTID = const(0x81)
+_VCNL4010_PROXRATE = const(0x82)
+_VCNL4010_IRLED = const(0x83)
+_VCNL4010_AMBIENTPARAMETER = const(0x84)
+_VCNL4010_AMBIENTDATA = const(0x85)
+_VCNL4010_PROXIMITYDATA = const(0x87)
+_VCNL4010_INTCONTROL = const(0x89)
+_VCNL4010_PROXINITYADJUST = const(0x8A)
+_VCNL4010_INTSTAT = const(0x8E)
+_VCNL4010_MODTIMING = const(0x8F)
+_VCNL4010_MEASUREAMBIENT = const(0x10)
+_VCNL4010_MEASUREPROXIMITY = const(0x08)
+_VCNL4010_AMBIENTREADY = const(0x40)
+_VCNL4010_PROXIMITYREADY = const(0x20)
 _VCNL4010_AMBIENT_LUX_SCALE = 0.25  # Lux value per 16-bit result value.
 
 # User-facing constants:
-FREQUENCY_3M125    = 3
-FREQUENCY_1M5625   = 2
-FREQUENCY_781K25   = 1
-FREQUENCY_390K625  = 0
+FREQUENCY_3M125 = 3
+FREQUENCY_1M5625 = 2
+FREQUENCY_781K25 = 1
+FREQUENCY_390K625 = 0
 # pylint: enable=bad-whitespace
 
 # Disable pylint's name warning as it causes too much noise.  Suffixes like
@@ -98,7 +98,7 @@ def __init__(self, i2c, address=_VCNL4010_I2CADDR_DEFAULT):
         # Verify chip ID.
         revision = self._read_u8(_VCNL4010_PRODUCTID)
         if (revision & 0xF0) != 0x20:
-            raise RuntimeError('Failed to find VCNL4010, check wiring!')
+            raise RuntimeError("Failed to find VCNL4010, check wiring!")
         self.led_current = 20
         self.frequency = FREQUENCY_390K625
         self._write_u8(_VCNL4010_INTCONTROL, 0x08)
@@ -218,6 +218,7 @@ def ambient(self):
             result = self._read_u8(_VCNL4010_COMMAND)
             if result & _VCNL4010_AMBIENTREADY:
                 return self._read_u16BE(_VCNL4010_AMBIENTDATA)
+
     # pylint: enable=inconsistent-return-statements
 
     @property

docs/conf.py

@@ -2,47 +2,55 @@
 
 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.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
 ]
 
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
 # autodoc_mock_imports = ["micropython", "adafruit_bus_device"]
 
-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 VCNL4010 Library'
-copyright = u'2017 Tony DiCola'
-author = u'Tony DiCola'
+project = u"Adafruit VCNL4010 Library"
+copyright = u"2017 Tony DiCola"
+author = u"Tony DiCola"
 
 # 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.
@@ -54,7 +62,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.
@@ -66,7 +74,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
@@ -80,68 +88,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 = 'AdafruitVcnl4010Librarydoc'
+htmlhelp_basename = "AdafruitVcnl4010Librarydoc"
 
 # -- 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, 'AdafruitVCNL4010Library.tex', u'AdafruitVCNL4010 Library Documentation',
-     author, 'manual'),
+    (
+        master_doc,
+        "AdafruitVCNL4010Library.tex",
+        u"AdafruitVCNL4010 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, 'AdafruitVCNL4010library', u'Adafruit VCNL4010 Library Documentation',
-     [author], 1)
+    (
+        master_doc,
+        "AdafruitVCNL4010library",
+        u"Adafruit VCNL4010 Library Documentation",
+        [author],
+        1,
+    )
 ]
 
 # -- Options for Texinfo output -------------------------------------------
@@ -150,7 +166,13 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'AdafruitVCNL4010Library', u'Adafruit VCNL4010 Library Documentation',
-     author, 'AdafruitVCNL4010Library', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "AdafruitVCNL4010Library",
+        u"Adafruit VCNL4010 Library Documentation",
+        author,
+        "AdafruitVCNL4010Library",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]

examples/vcnl4010_simpletest.py

@@ -15,22 +15,22 @@
 
 # You can optionally adjust the sensor LED current.  The default is 200mA
 # which is the maximum value.  Note this is only set in 10mA increments.
-#sensor.led_current_mA = 120  # Set 120 mA LED current
+# sensor.led_current_mA = 120  # Set 120 mA LED current
 
 # You can also adjust the measurement frequency for the sensor.  The default
 # is 390.625 khz, but these values are possible to set too:
 # - FREQUENCY_3M125: 3.125 Mhz
 # - FREQUENCY_1M5625: 1.5625 Mhz
 # - FREQUENCY_781K25: 781.25 Khz
 # - FREQUENCY_390K625: 390.625 Khz (default)
-#sensor.frequency = adafruit_vcnl4010.FREQUENCY_3M125  # 3.125 Mhz
+# sensor.frequency = adafruit_vcnl4010.FREQUENCY_3M125  # 3.125 Mhz
 
 # Main loop runs forever printing the proximity and light level.
 while True:
     proximity = sensor.proximity  # Proximity has no units and is a 16-bit
-                                  # value.  The LOWER the value the further
-                                  # an object from the sensor (up to ~200mm).
-    print('Proximity: {0}'.format(proximity))
+    # value.  The LOWER the value the further
+    # an object from the sensor (up to ~200mm).
+    print("Proximity: {0}".format(proximity))
     ambient_lux = sensor.ambient_lux
-    print('Ambient light: {0} lux'.format(ambient_lux))
+    print("Ambient light: {0} lux".format(ambient_lux))
     time.sleep(1.0)

setup.py

@@ -7,54 +7,46 @@
 
 # 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-vcnl4010',
-
+    name="adafruit-circuitpython-vcnl4010",
     use_scm_version=True,
-    setup_requires=['setuptools_scm'],
-
-    description='CircuitPython library for VCNL4010 proximity and light sensor.',
+    setup_requires=["setuptools_scm"],
+    description="CircuitPython library for VCNL4010 proximity and light 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_VCNL4010',
-
+    url="https://github.com/adafruit/Adafruit_CircuitPython_VCNL4010",
     # 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 vcnl4010 proximity light sensor breakout hardware micropython circuitpython',
-
+    keywords="adafruit vcnl4010 proximity light sensor breakout 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_vcnl4010'],
+    py_modules=["adafruit_vcnl4010"],
 )