Tox and travis config

saimn · Sep 28, 2013 · d8f9df2 · d8f9df2
1 parent 3e342b8
commit d8f9df2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,9 @@
 *.pyc
 *_flymake
 .coverage
-.sass-cache/
 .ropeproject/
+.sass-cache/
+.tox/
 nose.cfg
 MANIFEST
 _build/

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
     - "2.7"
-    - "2.6"
+    - "3.3"
 before_install:
     # Dependencies to build PIL
     - sudo apt-get update -qq

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,14 @@
+[tox]
+envlist = py27,py33
+
+[testenv]
+commands = py.test
+deps =
+
+[testenv:py27]
+deps =
+    pytest
+
+[testenv:py33]
+deps =
+    pytest