Merge remote-tracking branch 'upstream/master' into basic_auth

2013-06-03 16:20:19 -07:00 · 2013-06-03 16:20:19 -07:00 · e784d10d2e
commit e784d10d2e
parent 9a899af02b ee4687752f
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -45,7 +45,7 @@ setup(
        'PasteScript',
        'wtforms',
        'py-bcrypt',
-        'pytest',
+        'pytest>=2.3',
        'pytest-xdist',
        'werkzeug>=0.7',
        'celery==2.5.3',