aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-07-10 17:40:57 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-07-10 17:40:57 -0500
commit2ae78574b3eb8c393136e7ebbc922d33bf6482f2 (patch)
tree3c7bccb010600319c5f34ddf41aa31620de8e951 /setup.py
parent5622cc44edfb2d653ae67946fa9ea130c5f7fcaa (diff)
parentd3b1fd2e606f549c5ecc2a31c94d90aa93794005 (diff)
downloadmediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.tar.lz
mediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.tar.xz
mediagoblin-2ae78574b3eb8c393136e7ebbc922d33bf6482f2.zip
Merge branch 'release-0.4.1'
Conflicts: mediagoblin/_version.py
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 aaf5cda9..6e026f30 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
'PasteScript',
'wtforms',
'py-bcrypt',
- 'pytest>=2.3',
+ 'pytest>=2.3.1',
'pytest-xdist',
'werkzeug>=0.7',
'celery==2.5.3',