From 5be6a4078698b1984168c983f49058c73a5c00ea Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Thu, 25 Apr 2019 16:25:15 +0300
Subject: [PATCH] Modernize .travis.yml and fix the list of suppored Python
 versions

---
 .travis.yml | 20 ++++++++++++--------
 CHANGES.rst |  4 +++-
 setup.py    |  4 +++-
 tox.ini     |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 22706ab..8662313 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,16 @@
 language: python
-sudo: false
-env:
-    - TOXENV=py26
-    - TOXENV=py27
-    - TOXENV=py33
+dist: xenial
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
 install:
-    - travis_retry pip install tox
+  - pip install zope.testrunner coverage coveralls
 script:
-    - tox
+  - coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress
+  - coverage report
+after_success:
+  - coveralls
 notifications:
-    email: false
+  email: false
diff --git a/CHANGES.rst b/CHANGES.rst
index 12ed746..0322b85 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,9 @@ Change History
 1.0.1 (unreleased)
 ~~~~~~~~~~~~~~~~~~
 
-- Nothing changed yet.
+- Add support for Python 3.6, 3.7.
+
+- Dropped Python 2.6 and 3.3 from Travis CI.
 
 
 1.0.0 (2017-01-04)
diff --git a/setup.py b/setup.py
index 54ab2ba..ffd53a6 100644
--- a/setup.py
+++ b/setup.py
@@ -56,11 +56,13 @@ def read_file(filename):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development'
+        'Topic :: Software Development',
         ],
       packages=find_packages('src'),
       package_dir = {'': 'src'},
diff --git a/tox.ini b/tox.ini
index de29ebf..f77274c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = coverage-clean, py27, py35, coverage-report
+envlist = coverage-clean, py27, py35, py36, py37, coverage-report
 
 [testenv]
 commands =