diff requirements_dev.txt @ 893:3aecf9058130

Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Tue, 17 Feb 2015 18:59:06 -0600
parents df09f327e1b9
children ccf3022c20d5
line wrap: on
line diff
--- a/requirements_dev.txt	Tue Feb 10 20:36:34 2015 -0600
+++ b/requirements_dev.txt	Tue Feb 17 18:59:06 2015 -0600
@@ -8,28 +8,26 @@
 gdata==2.0.15
 html5lib==0.999
 bleach==1.4
-pytz==2013b
+pytz==2013b0
 queued-search==2.1.0
-hg+https://bgneal@bitbucket.org/bgneal/queues@862e884#egg=queues
+-e hg+https://bgneal@bitbucket.org/bgneal/queues@862e8846f7e5f5a0df7f08bfe4b4e5283acb4614#egg=queues-dev
 redis==2.7.2
 repoze.timeago==0.5
--e git+https://github.com/notanumber/xapian-haystack.git@37add92bc43fe50bf165e91f370269c26272f1eb#egg=xapian_haystack-master
+-e git+https://github.com/notanumber/xapian-haystack.git@37add92bc43fe50bf165e91f370269c26272f1eb#egg=xapian_haystack-dev
 anyjson==0.3.3
 celery==3.1.7
 django-picklefield==0.3.1
 kombu==3.0.8
 python-dateutil==1.5
 python-memcached==1.48
-wsgiref==0.1.2
 docutils==0.10
 amqp==1.3.3
 Fabric==1.4.1
-argparse==1.2.1
 six==1.8.0
 pycrypto==2.5
 ssh==1.7.13
 ftfy==2.0.1
-Pillow==2.4.0
+Pillow==2.7.0
 boto==2.13.0
 sqlparse==0.1.10
 billiard==3.3.0.13
@@ -41,6 +39,7 @@
 rsa==3.1.4
 simplejson==3.6.5
 uritemplate==0.6
+mock==1.0.1
 #
 # These packages I punted on and hacked into my virtualenv by
 # symlinking to the global site-packages: