diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 10:40:35 -0800 |
commit | 8cc9ae059ffa6e484d24149ff7508555bfaed1b6 (patch) | |
tree | d9c8dde5cfb2537e83ffedad1e3490608c9943b2 /tox.ini | |
parent | 935c55dd1f596f97bd8c3d76dd8abfe9cffaa8b0 (diff) | |
parent | a83f0d3038e8d16e7c160293d16c2736645564d6 (diff) |
Merge branch '1.11' into 1.12
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r dev-requirements.txt +commands = pip install --use-mirrors -q -r tox-requirements.txt python test.py |