diff options
| author | Thomas Goirand <thomas@goirand.fr> | 2013-05-12 05:32:34 +0000 |
|---|---|---|
| committer | Thomas Goirand <thomas@goirand.fr> | 2013-05-12 05:32:34 +0000 |
| commit | 28991f9514e3cd78a528bbbe956d9b4536c416e0 (patch) | |
| tree | a3871392d2382f60490824d79058f8a71ae1c34e /tox.ini | |
| parent | 57fa2e21aed37c1af2a87f36a998046b73092a21 (diff) | |
| parent | 876845102c4a217496d0f6435bfe1e3726d31fe4 (diff) | |
| download | factory-boy-28991f9514e3cd78a528bbbe956d9b4536c416e0.tar factory-boy-28991f9514e3cd78a528bbbe956d9b4536c416e0.tar.gz | |
Merge tag '2.0.2' into debian/unstable
Release of factory_boy 2.0.2
Conflicts:
docs/changelog.rst
docs/index.rst
docs/subfactory.rst
tests/cyclic/bar.py
tests/cyclic/foo.py
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -3,9 +3,15 @@ envlist = py26,py27,pypy [testenv] commands= - python setup.py test + python -W default setup.py test [testenv:py26] deps= + mock unittest2 + +[textenv:py27] + +deps= + mock |