From 11e33ea4cd51b43405a9ea32cc2aaea812aa343e Mon Sep 17 00:00:00 2001 From: dherrada Date: Mon, 16 Mar 2020 16:22:25 -0400 Subject: [PATCH] Ran black, updated to pylint 2.x --- .github/workflows/build.yml | 2 +- adafruit_servokit.py | 23 +++++-- docs/conf.py | 120 ++++++++++++++++++++++-------------- setup.py | 64 +++++++++---------- 4 files changed, 121 insertions(+), 88 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_servokit.py b/adafruit_servokit.py index 5722939..624afee 100644 --- a/adafruit_servokit.py +++ b/adafruit_servokit.py @@ -76,14 +76,19 @@ class ServoKit: Default reference clock speed is ``25000000``. """ - def __init__(self, *, channels, i2c=None, address=0x40, reference_clock_speed=25000000): + + def __init__( + self, *, channels, i2c=None, address=0x40, reference_clock_speed=25000000 + ): if channels not in [8, 16]: raise ValueError("servo_channels must be 8 or 16!") self._items = [None] * channels self._channels = channels if i2c is None: i2c = board.I2C() - self._pca = PCA9685(i2c, address=address, reference_clock_speed=reference_clock_speed) + self._pca = PCA9685( + i2c, address=address, reference_clock_speed=reference_clock_speed + ) self._pca.frequency = 50 self._servo = _Servo(self) @@ -141,7 +146,8 @@ def __init__(self, kit): self.kit = kit def __getitem__(self, servo_channel): - import adafruit_motor.servo + import adafruit_motor.servo # pylint: disable=import-outside-toplevel + num_channels = self.kit._channels if servo_channel >= num_channels or servo_channel < 0: raise ValueError("servo must be 0-{}!".format(num_channels - 1)) @@ -164,16 +170,21 @@ def __init__(self, kit): self.kit = kit def __getitem__(self, servo_channel): - import adafruit_motor.servo + import adafruit_motor.servo # pylint: disable=import-outside-toplevel + num_channels = self.kit._channels if servo_channel >= num_channels or servo_channel < 0: raise ValueError("servo must be 0-{}!".format(num_channels - 1)) servo = self.kit._items[servo_channel] if servo is None: - servo = adafruit_motor.servo.ContinuousServo(self.kit._pca.channels[servo_channel]) + servo = adafruit_motor.servo.ContinuousServo( + self.kit._pca.channels[servo_channel] + ) self.kit._items[servo_channel] = servo return servo - if isinstance(self.kit._items[servo_channel], adafruit_motor.servo.ContinuousServo): + if isinstance( + self.kit._items[servo_channel], adafruit_motor.servo.ContinuousServo + ): return servo raise ValueError("Channel {} is already in use.".format(servo_channel)) diff --git a/docs/conf.py b/docs/conf.py index ec6b4fd..767befc 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,10 +11,10 @@ # 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! @@ -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 ServoKit Library' -copyright = u'2018 Kattni Rembor' -author = u'Kattni Rembor' +project = u"Adafruit ServoKit Library" +copyright = u"2018 Kattni Rembor" +author = u"Kattni Rembor" # 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. @@ -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. @@ -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 @@ -84,59 +96,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 = 'AdafruitServokitLibrarydoc' +htmlhelp_basename = "AdafruitServokitLibrarydoc" # -- 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, 'AdafruitServoKitLibrary.tex', u'AdafruitServoKit Library Documentation', - author, 'manual'), + ( + master_doc, + "AdafruitServoKitLibrary.tex", + u"AdafruitServoKit Library Documentation", + author, + "manual", + ), ] # -- Options for manual page output --------------------------------------- @@ -144,8 +159,13 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'AdafruitServoKitlibrary', u'Adafruit ServoKit Library Documentation', - [author], 1) + ( + master_doc, + "AdafruitServoKitlibrary", + u"Adafruit ServoKit Library Documentation", + [author], + 1, + ) ] # -- Options for Texinfo output ------------------------------------------- @@ -154,7 +174,13 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'AdafruitServoKitLibrary', u'Adafruit ServoKit Library Documentation', - author, 'AdafruitServoKitLibrary', 'One line description of project.', - 'Miscellaneous'), + ( + master_doc, + "AdafruitServoKitLibrary", + u"Adafruit ServoKit Library Documentation", + author, + "AdafruitServoKitLibrary", + "One line description of project.", + "Miscellaneous", + ), ] diff --git a/setup.py b/setup.py index 0e5d468..12eeec6 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,51 +15,46 @@ 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-servokit', - + name="adafruit-circuitpython-servokit", use_scm_version=True, - setup_requires=['setuptools_scm'], - - description='CircuitPython helper library for PWM/Servo FeatherWing, Shield, and ' - 'Pi HAT and Bonnet kits.', + setup_requires=["setuptools_scm"], + description="CircuitPython helper library for PWM/Servo FeatherWing, Shield, and " + "Pi HAT and Bonnet kits.", 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_ServoKit', - + url="https://github.com/adafruit/Adafruit_CircuitPython_ServoKit", # Author details - author='Adafruit Industries', - author_email='circuitpython@adafruit.com', - - install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice', - 'adafruit-circuitpython-register', 'adafruit-circuitpython-pca9685', - 'adafruit-circuitpython-motor'], - + author="Adafruit Industries", + author_email="circuitpython@adafruit.com", + install_requires=[ + "Adafruit-Blinka", + "adafruit-circuitpython-busdevice", + "adafruit-circuitpython-register", + "adafruit-circuitpython-pca9685", + "adafruit-circuitpython-motor", + ], # 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 servo motor pwm pca9685 featherwing pi shield bonnet servokit kit i2c ' - 'hardware micropython circuitpython', - + keywords="adafruit servo motor pwm pca9685 featherwing pi shield bonnet servokit kit i2c " + "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_servokit'], -) \ No newline at end of file + py_modules=["adafruit_servokit"], +)