From 6db9933e832e95380339c525051be853f41fec93 Mon Sep 17 00:00:00 2001
From: Abhas Bhattacharya <abhasbhattacharya2@gmail.com>
Date: Thu, 14 Jan 2016 03:30:54 +0530
Subject: [PATCH] Reorder travis env and add tox config for 3.5-dev

---
 .travis.yml | 32 +++++++++++++++++---------------
 tox.ini     |  4 ++++
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2b70d1f..004df6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,22 +6,24 @@ addons:
     packages:
     - redis-server
 
+matrix:
+  # major versions, test first
+  include:
+    - env: TOXENV=py27
+    - env: TOXENV=py35-dev
+      python: "3.5-dev"
 env:
-  matrix:
-    # major versions, test first
-    - TOXENV=py27
-    - TOXENV=py35
-    # other versions
-    - TOXENV=py26
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=pypy
-    - TOXENV=pypy3
-    # not included, for incompatibility
-    # - "2.5" # tarvis errs
-    # - "3.2" # humanfriendly cant install
-    # - "pypy3" # psutil errs
+  # - TOXENV=py27
+  # - TOXENV=py35-dev
+  # other versions
+  - TOXENV=py26
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
+  # not included, for incompatibility
+  # - "2.5" # tarvis errs
+  # - "3.2" # humanfriendly cant install
+  # - "pypy3" # psutil errs
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index 9b4406b..fd1d248 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,13 @@ skipsdist = true
 envlist = py{26,27,34,35}
 
 [testenv]
+deps = pytest
 passenv = PYTEST_STATUS_PORT
         REDIS_PATH
         REDIS_ARGS
 
 commands = pip install .
         py.test -v
+
+[testenv:py35-dev]
+basepython = python3.5-dev