From 07b4dea2c4bcdb5bb6975c8e8a8978c51e321e4d Mon Sep 17 00:00:00 2001
From: Donald Stufft <donald@stufft.io>
Date: Mon, 14 Sep 2015 09:26:12 -0400
Subject: [PATCH] Test the released version of 3.5 instead of dev

---
 .travis.yml    | 12 +++++++-----
 .travis/run.sh |  5 +++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index adcf9710e..d71b14cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,18 +13,20 @@ matrix:
           env: TOXENV=py33
         - python: 3.4
           env: TOXENV=py34
-        - python: 3.5-dev
+        - python: 3.5
           env: TOXENV=py35
+        - python: nightly
+          env: TOXENV=py36
         - python: pypy
           env: TOXENV=pypy
         - python: 2.7
           env: TOXENV=py27 VENDOR=no
-        - python: 3.4
-          env: TOXENV=py34 VENDOR=no
+        - python: 3.5
+          env: TOXENV=py35 VENDOR=no
         - python: 2.7
           env: TOXENV=py27 VENDOR=no WHEELS=yes
-        - python: 3.4
-          env: TOXENV=py34 VENDOR=no WHEELS=yes
+        - python: 3.5
+          env: TOXENV=py35 VENDOR=no WHEELS=yes
         - env: TOXENV=docs
         - env: TOXENV=pep8
         - env: TOXENV=py3pep8
diff --git a/.travis/run.sh b/.travis/run.sh
index c4d2c68e6..a26183409 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -7,6 +7,11 @@ if [[ $TOXENV = "py35" ]]; then
     export TOXARGS="--assert=plain"
 fi
 
+# If we're running under Python 3.6, we can't use anything but --asert=plain
+if [[ $TOXENV = "py36" ]]; then
+    export TOXARGS="--assert=plain"
+fi
+
 # We want to create the virtual environment here, but not actually run anything
 tox --notest