From 6719a818e74d095f8b42d052d4ec569aeb7a0197 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Wed, 15 Jul 2015 16:03:14 -0700
Subject: [PATCH] Match .travis.yml env list to tox envs

Conflicts:
	.travis.yml
---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79be84547..d2e8e99e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,19 +10,18 @@ env:
     - TESTENV=flakes
     - TESTENV=py26
     - TESTENV=py27
+    - TESTENV=py33
     - TESTENV=py34
     - TESTENV=py35
     - TESTENV=pypy
     - TESTENV=py27-pexpect
-    - TESTENV=py33-pexpect
+    - TESTENV=py34-pexpect
     - TESTENV=py27-nobyte
-    - TESTENV=py33
     - TESTENV=py27-xdist
-    - TESTENV=py33-xdist
-    - TESTENV=py27
+    - TESTENV=py34-xdist
     - TESTENV=py27-trial
     - TESTENV=py33
-    - TESTENV=py33-trial
+    - TESTENV=py34-trial
     # inprocess tests by default were introduced in 2.8 only;
     # this TESTENV should be enabled when merged back to master
     #- TESTENV=py27-subprocess