aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-06-03 16:20:19 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-06-03 16:20:19 -0700
commite784d10d2e8b8f9f7a5980883553766ce9bfaf6c (patch)
treeb6bf86e939357fb9ff00850dbe6f7c012dba09f6 /setup.py
parent9a899af02b6dbd2792482f39405d22e0361c8bf6 (diff)
parentee4687752f8d1eccee8d5dc4d1c1b88de3a81f9e (diff)
downloadmediagoblin-e784d10d2e8b8f9f7a5980883553766ce9bfaf6c.tar.lz
mediagoblin-e784d10d2e8b8f9f7a5980883553766ce9bfaf6c.tar.xz
mediagoblin-e784d10d2e8b8f9f7a5980883553766ce9bfaf6c.zip
Merge remote-tracking branch 'upstream/master' into basic_auth
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 4ceac45b..f320e92c 100644
--- 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',