Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka_Displayio into...

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ba1c3ff35b6192a06fd84b522182c7d49fd5904..2582867ba777701eabcf19c888d4c5a68f3c50a7 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-        pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
+        pip install --force-reinstall pylint black Sphinx sphinx-rtd-theme
     - name: Library version
       run: git describe --dirty --always --tags
     - name: Check formatting

diff --git a/displayio/fourwire.py b/displayio/fourwire.py
index 64be5c87dddb4739369f272fd9258231743fbf94..219656ca77f5ee4cef8df18f4778fc329526030e 100644 (file)
--- a/displayio/fourwire.py
+++ b/displayio/fourwire.py
@@ -116,8 +116,7 @@ class FourWire:
             self._spi.write(data)
 
     def begin_transaction(self):
-        """Begin the SPI transaction by locking, configuring, and setting Chip Select
-        """
+        """Begin the SPI transaction by locking, configuring, and setting Chip Select"""
         while not self._spi.try_lock():
             pass
         self._spi.configure(
@@ -126,7 +125,6 @@ class FourWire:
         self._chip_select.value = False
 
     def end_transaction(self):
-        """End the SPI transaction by unlocking and setting Chip Select
-        """
+        """End the SPI transaction by unlocking and setting Chip Select"""
         self._chip_select.value = True
         self._spi.unlock()

diff --git a/setup.py b/setup.py
index 4070f703522cfc54c73d5378ccfe8542991d8453..0a8fc6b39539df394f427b797e0d1138a4de390a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,12 @@ setup(
     # Author details
     author="Adafruit Industries",
     author_email="circuitpython@adafruit.com",
-    install_requires=["Adafruit-Blinka", "pillow", "numpy", "recordclass",],
+    install_requires=[
+        "Adafruit-Blinka",
+        "pillow",
+        "numpy",
+        "recordclass",
+    ],
     # Choose your license
     license="MIT",
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers