Merge branch 'master' into travis-lint, fixing some conflicts, and fixing mypy errors around unspecified generics.

Author: mahmoud

.travis.yml

@@ -1,7 +1,4 @@
-sudo: false
-cache:
-directories:
-- $HOME/.cache/pip
+cache: pip
 
 language: python
 

README.md

@@ -25,7 +25,7 @@ Hyperlink provides a pure-Python implementation of immutable
 URLs. Based on [RFC 3986][rfc3986] and [3987][rfc3987], the Hyperlink URL
 makes working with both URIs and IRIs easy.
 
-Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, and PyPy.
+Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, and PyPy.
 
 Full documentation is available on [Read the Docs][docs].
 

docs/index.rst

@@ -10,7 +10,7 @@ hyperlink
 URLs. Based on `RFC 3986`_ and `RFC 3987`_, the Hyperlink URL balances
 simplicity and correctness for both :ref:`URIs and IRIs <uris_and_iris>`.
 
-Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, and PyPy.
+Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, and PyPy.
 
 For an introduction to the hyperlink library, its background, and URLs
 in general, see `this talk from PyConWeb 2017`_ (and `the accompanying

setup.py

@@ -34,16 +34,21 @@
           'idna>=2.5',
           'typing ; python_version<"3.5"',
       ],
+      python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
       classifiers=[
           'Topic :: Utilities',
           'Intended Audience :: Developers',
           'Topic :: Software Development :: Libraries',
           'Development Status :: 5 - Production/Stable',
+          'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.6',
           '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.8',
           'Programming Language :: Python :: Implementation :: PyPy',
           'License :: OSI Approved :: MIT License', ]
       )