Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elide python 2.7 from setup & project infra #110

Merged
merged 1 commit into from Jun 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .readthedocs.yml
@@ -1,5 +1,5 @@
python:
version: 2.7
version: 3.6
pip_install: true
extra_requirements:
- docs
6 changes: 2 additions & 4 deletions .travis.yml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Expand Up @@ -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'
]
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions tests/helpers.py
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_backlight.py
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion tests/test_ht1621.py
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion tests/test_ili9341.py
Expand Up @@ -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():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_pcd8544.py
Expand Up @@ -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():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_st7567.py
Expand Up @@ -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():
Expand Down
3 changes: 2 additions & 1 deletion tests/test_st7735.py
Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions tests/test_uc1701x.py
Expand Up @@ -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():
Expand Down