Merge b656ef4 into 3cd2e3e

.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: 3.5
           env: TOXENV=qa,doc
 

LICENSE.rst

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------
 
-Copyright (c) 2014-2019 Richard Hull and contributors
+Copyright (c) 2014-2020 Richard Hull and 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

README.rst

@@ -25,12 +25,13 @@ Luma.OLED
 .. image:: https://img.shields.io/pypi/v/luma.oled.svg
    :target: https://pypi.python.org/pypi/luma.oled
 
-.. image:: https://img.shields.io/maintenance/yes/2019.svg?maxAge=2592000
+.. image:: https://img.shields.io/maintenance/yes/2020.svg?maxAge=2592000
 
 Python library interfacing OLED matrix displays with the SSD1306, SSD1309,
 SSD1322, SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 driver using I2C/SPI on
 the Raspberry Pi and other linux-based single-board computers - it provides a
-Pillow-compatible drawing canvas, and other functionality to support:
+`Pillow <https://pillow.readthedocs.io/>`_-compatible drawing canvas, and other
+functionality to support:
 
 * scrolling/panning capability,
 * terminal-style printing,
@@ -93,7 +94,7 @@ License
 -------
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Richard Hull and contributors
+Copyright (c) 2014-2020 Richard Hull and 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

setup.py

@@ -29,6 +29,7 @@ def find_version(*file_paths):
 CONTRIB = read_file('CONTRIBUTING.rst')
 CHANGES = read_file('CHANGES.rst')
 version = find_version('luma', 'oled', '__init__.py')
+project_url = 'https://github.com/rm-hull/luma.oled'
 
 needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
@@ -47,13 +48,20 @@ def find_version(*file_paths):
                  "SSD1306, SSD1309, SSD1322, SSD1325, SSD1327, SSD1331, "
                  "SSD1351 or SH1106 chipset"),
     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',
     license="MIT",
     keywords=("raspberry pi rpi oled display screen "
               "rgb monochrome greyscale color "
               "ssd1306 ssd1309 ssd1322 ssd1325 ssd1327 ssd1331 ssd1351 sh1106 "
               "spi i2c 256x64 128x64 128x32 96x16"),
-    url="https://github.com/rm-hull/luma.oled",
-    download_url="https://github.com/rm-hull/luma.oled/tarball/" + version,
+    url=project_url,
+    download_url=project_url + "/tarball/" + version,
+    project_urls={
+        'Documentation': 'https://luma-oled.readthedocs.io',
+        'Source': project_url,
+        'Issue Tracker': project_url + '/issues',
+    },
     packages=find_packages(),
     namespace_packages=["luma"],
     zip_safe=False,
@@ -80,9 +88,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"
     ]
 )

tox.ini

@@ -1,8 +1,8 @@
-# Copyright (c) 2014-18 Richard Hull and contributors
+# Copyright (c) 2014-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]