Merge branch '1.5-support' of git://github.com/alej0varas/mock-django into alej0varas-1.5-support

Conflicts:
	.gitignore

Author: dcramer

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 *.egg
 *.egg-info/
+*~
 /dist
 /build
-*~
+.tox

.travis.yml

@@ -6,6 +6,8 @@ python:
 env:
   - DJANGO=1.2.7
   - DJANGO=1.3.1
+  - DJANGO=1.4.5
+  - DJANGO=1.5.1
 install:
   - sudo apt-get install libevent-dev
   - sudo pip install Django==$DJANGO --use-mirrors

README.rst

@@ -29,4 +29,4 @@ Testing
    :alt: Build Status
    :target: http://travis-ci.org/dcramer/mock-django
 
-``python setup.py test``
+``tox``

setup.py

@@ -19,7 +19,7 @@
     url='http://github.com/dcramer/mock-django',
     packages=find_packages(),
     install_requires=[
-        'Django>=1.2,<1.5',
+        'Django>=1.2',
         'mock',
     ],
     tests_require=[

tests/requirements.txt

@@ -0,0 +1,2 @@
+nose
+unittest2

tox.ini

@@ -0,0 +1,61 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27-1.5,py26-1.5,py27-1.4,py26-1.4,py27-1.3,py26-1.3,py27-1.2,py26-1.2
+
+[testenv]
+commands = {envpython} runtests.py
+deps =
+    nose
+    unittest2
+
+[testenv:py27-1.5]
+basepython = python2.7
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.5
+
+[testenv:py26-1.5]
+basepython = python2.6
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.5
+
+[testenv:py27-1.4]
+basepython = python2.7
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.4
+
+[testenv:py26-1.4]
+basepython = python2.6
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.4
+
+[testenv:py27-1.3]
+basepython = python2.7
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.3
+
+[testenv:py26-1.3]
+basepython = python2.6
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.3
+
+[testenv:py27-1.2]
+basepython = python2.7
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.2
+
+[testenv:py26-1.2]
+basepython = python2.6
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    django==1.2