Initial Tox and Travis setup

diff --git a/.gitignore b/.gitignore
index ca4c4365db34b6eb93cc2b76e57a7911423c83f8..b5c791b1082667658408ae3c38c1939609e52d95 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ build*
 /coverage_html_report/
 /htmlcov/
 /uploads/
+.tox

diff --git a/.travis.yml b/.travis.yml
index c7510e8a7eebc0cc27a702ef8f49159373b174b0..0a9f9a24e276b0bf0f83c01f18623ac9e9a3b78f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,15 @@
 language: python
-
-python:
-  - "2.7"
-
+python: "2.7"
 env:
-  - DJANGO="django==1.6.5"
-
-
+- TOX_ENV=py27
+- TOX_ENV=py33
+- TOX_ENV=py34
 install:
-  -  python setup.py sdist
-  -  cd dist
-  -  easy_install "$(ls .)"
-  -  cd ..
-  -  pip install -r requirements.txt
+- pip install tox
 script:
-  -  python setup.py test
+- tox -e $TOX_ENV
+matrix:
+  fast_finish: true
+  allow_failures:
+  - env: TOX_ENV=py33
+  - env: TOX_ENV=py34

diff --git a/requirements.txt b/requirements.txt
index d90ec7fb4ab97def3200c56dd176077dc149a89f..3ed175760d699cb520d0f4163fb1519c2747abdf 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,6 @@
 django-model-utils==2.0.3
 Django==1.6.5
 Pillow==2.5.0
+
+# Only needed for running tests.
+tox

diff --git a/tox.ini b/tox.ini
new file mode 100644 (file)
index 0000000..6dd8f87
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py27,py33,py34
+
+[testenv]
+deps=-rrequirements.txt
+commands=python setup.py test