diff options
| author | Tom Christie | 2011-07-01 17:44:08 +0100 |
|---|---|---|
| committer | Tom Christie | 2011-07-01 17:44:08 +0100 |
| commit | f7b7778a79bad4124a6f50bf461f206a6d71fa90 (patch) | |
| tree | 2bd1b84a90dec5724cda3d89b3a9faf5ca298961 /tox.ini | |
| parent | c3babe751a6bab7c7888f173b7853a65ba2ea35e (diff) | |
| parent | f67c0651baf1cea65221b4fb7f4df11a54abed90 (diff) | |
| download | django-rest-framework-f7b7778a79bad4124a6f50bf461f206a6d71fa90.tar.bz2 | |
pull in markos changes, minor tweaks to yaml stuff
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 32 |
1 files changed, 22 insertions, 10 deletions
@@ -29,6 +29,7 @@ deps= django==1.2.4 coverage==3.4 unittest-xml-reporting==1.2 + Pyyaml==3.10 [testenv:py26-django12] basepython=python2.6 @@ -36,6 +37,7 @@ deps= django==1.2.4 coverage==3.4 unittest-xml-reporting==1.2 + Pyyaml==3.10 [testenv:py27-django12] basepython=python2.7 @@ -43,28 +45,32 @@ deps= django==1.2.4 coverage==3.4 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py25-django13] basepython=python2.5 deps= django==1.3 coverage==3.4 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py26-django13] basepython=python2.6 deps= django==1.3 coverage==3.4 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py27-django13] basepython=python2.7 deps= django==1.3 coverage==3.4 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + ####################################### EXAMPLES ################################################ [testenv:py25-django12e] @@ -79,7 +85,8 @@ deps= httplib2==0.6.0 Markdown==2.0.3 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py26-django12e] basepython=python2.6 commands= @@ -92,7 +99,8 @@ deps= httplib2==0.6.0 Markdown==2.0.3 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py27-django12e] basepython=python2.7 commands= @@ -105,7 +113,8 @@ deps= httplib2==0.6.0 Markdown==2.0.3 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py25-django13e] basepython=python2.5 commands= @@ -118,7 +127,8 @@ deps= httplib2==0.6.0 Markdown==2.0.3 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py26-django13e] basepython=python2.6 commands= @@ -131,7 +141,8 @@ deps= httplib2==0.6.0 Markdown==2.0.3 unittest-xml-reporting==1.2 - + Pyyaml==3.10 + [testenv:py27-django13e] basepython=python2.7 commands= @@ -143,4 +154,5 @@ deps= Pygments==1.4 httplib2==0.6.0 Markdown==2.0.3 - unittest-xml-reporting==1.2
\ No newline at end of file + unittest-xml-reporting==1.2 + Pyyaml==3.10
\ No newline at end of file |