Skip to content

Commit

Permalink
Merge d044337 into b985f5f
Browse files Browse the repository at this point in the history
  • Loading branch information
thijstriemstra committed Jan 9, 2020
2 parents b985f5f + d044337 commit 64369ea
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
@@ -1,19 +1,19 @@
dist: xenial
dist: bionic
language: python
cache: pip

matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.7
env: TOXENV=py37
- python: 3.8-dev
env: TOXENV=py38
- python: 2.7
env: TOXENV=qa,doc

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.rst
@@ -1,7 +1,7 @@
The MIT License (MIT)
---------------------

Copyright (c) 2013-2019 Richard Hull & Contributors
Copyright (c) 2013-2020 Richard Hull & Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Expand Up @@ -30,8 +30,8 @@ Luma.LCD

Python 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-compatible drawing canvas, and
other functionality to support:
single-board computers - it provides a `Pillow <https://pillow.readthedocs.io/>`_-compatible
drawing canvas, and other functionality to support:

* scrolling/panning capability,
* terminal-style printing,
Expand Down Expand Up @@ -66,7 +66,7 @@ License
-------
The MIT License (MIT)

Copyright (c) 2013-2019 Richard Hull & Contributors
Copyright (c) 2013-2020 Richard Hull & Contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 11 additions & 5 deletions setup.py
Expand Up @@ -29,6 +29,7 @@ def find_version(*file_paths):
CONTRIB = read_file('CONTRIBUTING.rst')
CHANGES = read_file('CHANGES.rst')
version = find_version('luma', 'lcd', '__init__.py')
project_url = 'https://github.com/rm-hull/luma.lcd'

needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
Expand All @@ -46,11 +47,16 @@ 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',
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
license="MIT",
keywords="raspberry pi rpi lcd nokia 5110 display screen pcd8544 st7735 uc1701x ht1621 ili9341 spi 84x48 160x128",
url="https://github.com/rm-hull/luma.lcd",
download_url="https://github.com/rm-hull/luma.lcd/tarball/" + version,
url=project_url,
download_url=project_url + "/tarball/" + version,
project_urls={
'Documentation': 'https://luma-lcd.readthedocs.io',
'Source': project_url,
'Issue Tracker': project_url + '/issues',
},
namespace_packages=["luma"],
packages=find_packages(),
zip_safe=False,
Expand All @@ -77,9 +83,9 @@ def find_version(*file_paths):
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7"
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8"
]
)
4 changes: 2 additions & 2 deletions tox.ini
@@ -1,8 +1,8 @@
# Copyright (c) 2013-2019 Richard Hull and contributors
# Copyright (c) 2013-2020 Richard Hull and contributors
# See LICENSE.rst for details.

[tox]
envlist = py{27,34,35,36,37},qa,doc
envlist = py{27,35,36,37,38},qa,doc
skip_missing_interpreters = True

[testenv]
Expand Down

0 comments on commit 64369ea

Please sign in to comment.