From 146a769afa063301d49e389de97383731697e1bf Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 22 Jan 2017 07:53:13 +0300
Subject: [PATCH] Add new Python versions to build matrix

Also update package metadata.

Fixes #1439
---
 .travis.yml | 26 +++++++++++++++++++-------
 setup.py    |  2 ++
 tox.ini     |  6 +++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35bac5a5..51a1cf72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,24 @@
 sudo: false
 language: python
-python: 3.5
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=pypy
+matrix:
+  include:
+    - python: 2.6
+      env: TOXENV=py26
+    - 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.6-dev
+      env: TOXENV=py36-dev
+    - python: nightly
+      env: TOXENV=py37
+  allow_failures:
+    - env: TOXENV=py36-dev
+    - env: TOXENV=py37
 install: pip install tox
 script: tox
 cache:
diff --git a/setup.py b/setup.py
index 3ca0daeb..8f3b9f1d 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ CLASSIFIERS = [
     'Programming Language :: Python :: 3.2',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
     'Topic :: Internet',
     'Topic :: Utilities',
     'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index 45ad867b..b18f9040 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py34, py35, pypy
+envlist = py26, py27, py34, py35, py36, py36-dev, py37, pypy
 skipsdist = True
 
 [testenv]
@@ -8,5 +8,5 @@ commands = py.test {posargs:tests/} --assert=plain
 deps =
   -rrequirements_test.txt
   py26: unittest2
-  py2{6,7},pypy: mock
-  py3{3,4}: aiohttp
+  py{26,27},pypy: mock
+  py{34,35,36,36-dev,37}: aiohttp