Merge branch 'master' into feature/st7920

.readthedocs.yml

@@ -1,5 +1,5 @@
 python:
-   version: 2.7
+   version: 3.6
    pip_install: true
    extra_requirements:
       - docs

.travis.yml

@@ -4,17 +4,15 @@ cache: pip
 
 matrix:
     include:
-        - python: 2.7
-          env: TOXENV=py27
         - python: 3.5
           env: TOXENV=py35
         - python: 3.6
           env: TOXENV=py36
         - python: 3.7
           env: TOXENV=py37
-        - python: 3.8-dev
+        - python: 3.8
           env: TOXENV=py38
-        - python: 2.7
+        - python: 3.6
           env: TOXENV=qa,doc
 
 addons:

CHANGES.rst

@@ -4,6 +4,8 @@ ChangeLog
 +------------+---------------------------------------------------------------------+------------+
 | Version    | Description                                                         | Date       |
 +============+=====================================================================+============+
+| **2.4.0**  | * Drop support for Python 2.7, only 3.5 or newer is supported now   | 2020/07/04 |
++------------+---------------------------------------------------------------------+------------+
 | **2.3.0**  | * Add PWM backlight control                                         | 2020/01/08 |
 +------------+---------------------------------------------------------------------+------------+
 | **2.2.0**  | * Add ILI9341 Colour LCD display driver                             | 2019/11/25 |

README.rst

@@ -28,7 +28,7 @@ Luma.LCD
 
 .. image:: https://img.shields.io/maintenance/yes/2020.svg?maxAge=2592000
 
-Python library interfacing LCD displays with the PCD8544, ST7735, ST7567, HT1621, 
+Python 3 library interfacing LCD displays with the PCD8544, ST7735, ST7567, HT1621, 
 UC1701X and ILI9341 driver using SPI on the Raspberry Pi and other linux-based
 single-board computers - it provides a `Pillow <https://pillow.readthedocs.io/>`_-compatible
 drawing canvas, and other functionality to support:

luma/lcd/__init__.py

@@ -6,4 +6,4 @@
 LCD display drivers.
 """
 
-__version__ = '2.3.0'
+__version__ = '2.4.0'

setup.py

@@ -34,7 +34,6 @@ def find_version(*file_paths):
 needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 test_deps = [
-    'mock;python_version<"3.3"',
     'pytest<=4.5',
     'pytest-cov'
 ]
@@ -47,7 +46,7 @@ def find_version(*file_paths):
     description=("A library to drive PCD8544, HT1621, ST7735, ST7567, UC1701X and ILI9341-based LCDs"),
     long_description="\n\n".join([README, CONTRIB, CHANGES]),
     long_description_content_type="text/x-rst",
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
+    python_requires='>=3.5, <4',
     license="MIT",
     keywords="raspberry pi rpi lcd nokia 5110 display screen pcd8544 st7735 uc1701x ht1621 ili9341 spi 84x48 160x128",
     url=project_url,
@@ -60,7 +59,7 @@ def find_version(*file_paths):
     namespace_packages=["luma"],
     packages=find_packages(),
     zip_safe=False,
-    install_requires=["luma.core>=1.12.0"],
+    install_requires=["luma.core>=1.14.0"],
     setup_requires=pytest_runner,
     tests_require=test_deps,
     extras_require={
@@ -80,8 +79,6 @@ def find_version(*file_paths):
         "Intended Audience :: Developers",
         "Topic :: Education",
         "Topic :: System :: Hardware",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",

tests/helpers.py

@@ -2,12 +2,8 @@
 # Copyright (c) 2017 Richard Hull and contributors
 # See LICENSE.rst for details.
 
-try:
-    from unittest.mock import call, Mock
-except ImportError:
-    from mock import call, Mock  # noqa: F401
-
 import pytest
+from unittest.mock import Mock
 
 import luma.core.error
 

tests/test_backlight.py

@@ -6,7 +6,7 @@
 import luma.core.error
 from luma.lcd.device import backlit_device
 from luma.core.interface.serial import noop
-from helpers import Mock
+from unittest.mock import Mock
 import pytest
 
 

tests/test_ht1621.py

@@ -9,7 +9,7 @@
 
 from luma.lcd.device import ht1621
 from luma.core.virtual import sevensegment
-from helpers import Mock  # noqa: F401
+from unittest.mock import Mock
 
 
 class MockHT1621:

tests/test_ili9341.py

@@ -13,7 +13,8 @@
 from luma.core.render import canvas
 
 from baseline_data import get_reference_data, primitives
-from helpers import Mock, serial, setup_function, assert_invalid_dimensions  # noqa: F401
+from helpers import serial, setup_function, assert_invalid_dimensions  # noqa: F401
+from unittest.mock import Mock
 
 
 def test_init_320x240():

tests/test_pcd8544.py

@@ -11,7 +11,8 @@
 from luma.core.render import canvas
 
 from baseline_data import get_reference_data, primitives
-from helpers import Mock, call, serial, setup_function  # noqa: F401
+from helpers import serial, setup_function  # noqa: F401
+from unittest.mock import Mock, call
 
 
 def test_init_84x48():

tests/test_st7567.py

@@ -13,7 +13,8 @@
 from luma.core.render import canvas
 
 from baseline_data import get_reference_data, primitives
-from helpers import Mock, serial, call, setup_function, assert_invalid_dimensions  # noqa: F401
+from helpers import serial, setup_function, assert_invalid_dimensions  # noqa: F401
+from unittest.mock import Mock, call
 
 
 def test_init_128x64():

tests/test_st7735.py

@@ -13,7 +13,8 @@
 from luma.core.render import canvas
 
 from baseline_data import get_reference_data, primitives
-from helpers import Mock, serial, setup_function, assert_invalid_dimensions  # noqa: F401
+from helpers import serial, setup_function, assert_invalid_dimensions  # noqa: F401
+from unittest.mock import Mock
 
 
 def test_init_160x128():

tests/test_uc1701x.py

@@ -11,8 +11,8 @@
 from luma.core.render import canvas
 
 from baseline_data import get_reference_data, primitives
-from helpers import (Mock, serial, call, setup_function,  # noqa: F401
-    assert_invalid_dimensions)
+from helpers import serial
+from unittest.mock import Mock, call
 
 
 def test_init_128x64():