Merge pull request #57 from tswicegood/add-detox

Add detox (just a config/test runner change, no new code)
django-ses · Oct 30, 2013 · c2be4a6 · c2be4a6
2 parents 13d371b + 78ee287
commit c2be4a6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 local_settings.py
 django_ses.egg-info
 dist/*
-.DS_Store
+.DS_Store
+.tox/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,7 @@
 language: python
 python:
-  - 2.6
   - 2.7
-install:
-  - sudo pip install -r requirements.txt
-script: python runtests.py
+script: detox
 notifications:
   email: false
   irc: false
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-Django==1.3.1
 boto==2.2.1
+detox==0.9.3
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,22 @@
+[tox]
+envlist = django13, django14, django15
+downloadcache = {toxworkdir}/.cache
+
+[testenv]
+commands =
+    python runtests.py
+
+[testenv:django13]
+deps =
+    -r{toxinidir}/requirements.txt
+    Django>=1.3,<1.4
+
+[testenv:django14]
+deps =
+    -r{toxinidir}/requirements.txt
+    Django>=1.4,<1.5
+
+[testenv:django15]
+deps =
+    -r{toxinidir}/requirements.txt
+    Django>=1.5,<1.6