summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml15
-rw-r--r--tox.ini2
2 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 48371d2..e14bb77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
language: python
-python: 2.7
+python:
+ - 2.6
+ - 2.7
before_install:
- git submodule update --init --recursive
@@ -14,12 +16,7 @@ install:
# See https://github.com/travis-ci/travis-cookbooks/issues/155
- sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
-env:
- - TOX_ENV=py26
- - TOX_ENV=py27
- - TOX_ENV=pypy
-
script:
- - tox -e $TOX_ENV
- - KAFKA_VERSION=0.8.0 tox -e $TOX_ENV
- - KAFKA_VERSION=0.8.1 tox -e $TOX_ENV
+ - tox
+ - KAFKA_VERSION=0.8.0 tox
+ - KAFKA_VERSION=0.8.1 tox
diff --git a/tox.ini b/tox.ini
index 3c5fd17..01f5a86 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26, py27, pypy
+envlist = py26, py27
[testenv]
deps =
unittest2