Update Travis and tox config

2 files changed, 44 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index bf6b829..9f3445d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,32 @@
 language: python
-python:
-  - 2.6
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
-  - pypy
+
+matrix:
+  include:
+    - python: 2.6
+      env: TOXENV=py26
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.2
+      env: TOXENV=py32
+    - python: 3.3
+      env: TOXENV=py33
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - env: TOXENV=pep8
+
+install:
+  - pip install tox
+
 script:
-    python test_uritemplate.py
+  - tox
+
 notifications:
-   on_success: change
-   on_failure: change
+  on_success: change
+  on_failure: change
+  irc:
+    channels:
+      - "irc.freenode.org#github3.py"
+    user_notice: true
+    skip_join: true
diff --git a/tox.ini b/tox.ini
index 1234a0e..c2c4dbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,18 @@
 [tox]
-envlist = py26,py27,py32,py33
+envlist =
+    py26,
+    py27,
+    py32,
+    py33,
+    py34,
+    py35,
+    pep8,
+
 [testenv]
 commands = python test_uritemplate.py
+
+[testenv:pep8]
+deps =
+    flake8
+commands =
+    flake8 {posargs} .