diff options
| author | Sean Brant | 2013-07-13 10:51:22 -0500 |
|---|---|---|
| committer | Sean Brant | 2013-07-13 10:57:43 -0500 |
| commit | dc8c1dce14c8ffcd0d1516b8ab52ae6f775d7337 (patch) | |
| tree | a8c516da20e46ea355d4675a84b57346db2eff1b /tox.ini | |
| parent | 82863b05a6767bb425985ebcb217ddea27d8f03b (diff) | |
| download | pykss-dc8c1dce14c8ffcd0d1516b8ab52ae6f775d7337.tar.bz2 | |
Fixes issues with Django trunk
Use the built in json module instead of django's simple json
bumps versions in tox
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1,10 +1,10 @@ [tox] -envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py26-djangotrunk, py27-djangotrunk, pypy-djangotrunk +envlist = py26, py27, pypy, py26-django1.4, py27-django1.4, pypy-django1.4, py27-djangotrunk, pypy-djangotrunk [testenv] commands = python setup.py test deps = - django==1.5 + django==1.5.1 mock pytest @@ -29,12 +29,6 @@ deps = mock pytest -[testenv:py26-djangotrunk] -basepython=python2.6 -deps = - https://github.com/django/django/tarball/master - mock - pytest [testenv:py27-djangotrunk] basepython = python2.7 |