diff requirements.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.txt	Tue Feb 10 20:36:34 2015 -0600
+++ b/requirements.txt	Tue Feb 17 18:59:06 2015 -0600
@@ -1,32 +1,29 @@
 Django==1.6.6
 Markdown==2.5.1
 MySQL-python==1.2.4
--e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-dev
+-e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
 django-haystack==2.1.0
 django-tagging==0.3.1
 gdata==2.0.15
 html5lib==1.0b3
 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-dev
+-e git+https://github.com/notanumber/xapian-haystack.git@37add92bc43fe50bf165e91f370269c26272f1eb#egg=xapian_haystack-master
 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
-python-ts3==0.1
 docutils==0.10
 amqp==1.3.3
-argparse==1.2.1
 six==1.8.0
 ftfy==2.0.1
-Pillow==2.4.0
+Pillow==2.7.0
 boto==2.13.0
 billiard==3.3.0.13
 google-api-python-client==1.3.1