diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-12 14:29:32 +0200 |
| commit | b1a2ec9a672d6f097d56d039d164918508f72ceb (patch) | |
| tree | 0e259ada6c41b5e660f2e64188238acf4594f140 /pkg/requirements-testing.pip | |
| parent | 4951157e3740b42ecef6775c8927b912a6ee8870 (diff) | |
| parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) | |
Merge branch 'master' into debian
Conflicts:
pkg/requirements.pip
setup.py
Diffstat (limited to 'pkg/requirements-testing.pip')
| -rw-r--r-- | pkg/requirements-testing.pip | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip index 2df5fe56..e789664a 100644 --- a/pkg/requirements-testing.pip +++ b/pkg/requirements-testing.pip @@ -1,6 +1,7 @@ nose nose-exclude nose-progressive +mock unittest2 # TODO we should include this dep only for python2.6 @@ -13,6 +14,5 @@ tox # double reqs # (the client already includes, which gives some errors) # ----------- -# mock # re-add XXX #twisted #zope.interface |