# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1446330991 18000
# Node ID 81b96f3c9e594e60379c7d8b2022e9a07d1e429a
# Parent  2908859c2fe4b3de822b43287c7a929451dce7bc
Reorganized requirements files to be DRY.

diff -r 2908859c2fe4 -r 81b96f3c9e59 requirements.txt
--- a/requirements.txt	Thu Oct 29 20:54:34 2015 -0500
+++ b/requirements.txt	Sat Oct 31 17:36:31 2015 -0500
@@ -1,40 +1,37 @@
+amqp==1.4.6
+anyjson==0.3.3
+billiard==3.3.0.20
+bleach==1.4
+boto==2.13.0
+celery==3.1.18
 Django==1.7.10
+django-haystack==2.3.1
+django-picklefield==0.3.1
+django-tagging==0.3.1
+docutils==0.10
+-e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
+-e git+https://github.com/notanumber/xapian-haystack.git@a3a3a4e7cfba3e2e1be3a42abf59edd29ea03c05#egg=xapian_haystack-master
+-e hg+https://bgneal@bitbucket.org/bgneal/queues@862e8846f7e5f5a0df7f08bfe4b4e5283acb4614#egg=queues-dev
+ftfy==2.0.1
+google-api-python-client==1.3.1
+html5lib==1.0b3
+httplib2==0.9
+kombu==3.0.26
+lxml==3.4.2
 Markdown==2.5.1
-MySQL-python==1.2.4
--e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
-django-haystack==2.3.1
-django-tagging==0.3.1
-html5lib==1.0b3
-bleach==1.4
-pytz==2013b0
+MySQL-python==1.2.5
+oauth2client==1.4.1
+Pillow==2.7.0
+pyasn1==0.1.7
+pyasn1-modules==0.0.5
+python-dateutil==1.5
+python-memcached==1.48
+pytz==2015.2
 queued-search==2.1.0
--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@a3a3a4e7cfba3e2e1be3a42abf59edd29ea03c05#egg=xapian_haystack-master
-anyjson==0.3.3
-celery==3.1.18
-django-picklefield==0.3.1
-kombu==3.0.26
-python-dateutil==1.5
-python-memcached==1.48
-docutils==0.10
-amqp==1.4.6
-six==1.8.0
-ftfy==2.0.1
-Pillow==2.7.0
-boto==2.13.0
-billiard==3.3.0.20
-google-api-python-client==1.3.1
-httplib2==0.9
-oauth2client==1.4.1
-pyasn1==0.1.7
-pyasn1-modules==0.0.5
+requests==2.7.0
 rsa==3.1.4
 simplejson==3.6.5
+six==1.8.0
 uritemplate==0.6
-requests==2.7.0
-#
-# These packages I punted on and hacked into my virtualenv by
-# symlinking to the global site-packages:
-# xapian
diff -r 2908859c2fe4 -r 81b96f3c9e59 requirements_dev.txt
--- a/requirements_dev.txt	Thu Oct 29 20:54:34 2015 -0500
+++ b/requirements_dev.txt	Sat Oct 31 17:36:31 2015 -0500
@@ -1,48 +1,8 @@
-Django==1.7.10
-Markdown==2.5.1
-MySQL-python==1.2.5
+-r requirements.txt
+Fabric==1.4.1
 django-debug-toolbar==1.3.0
-django-haystack==2.3.1
-django-tagging==0.3.1
-html5lib==0.999
-bleach==1.4
-pytz==2015.2
-queued-search==2.1.0
-redis==2.7.2
-repoze.timeago==0.5
-anyjson==0.3.3
-celery==3.1.18
-django-picklefield==0.3.1
-kombu==3.0.26
-python-dateutil==1.5
-python-memcached==1.48
-docutils==0.10
-amqp==1.4.6
-Fabric==1.4.1
-six==1.8.0
+mock==1.0.1
 pycrypto==2.5
+sqlparse==0.1.14
 ssh==1.7.13
-ftfy==2.0.1
-Pillow==2.7.0
-boto==2.13.0
-sqlparse==0.1.14
-billiard==3.3.0.20
-google-api-python-client==1.3.1
-httplib2==0.9
-oauth2client==1.4.1
-pyasn1==0.1.7
-pyasn1-modules==0.0.5
-rsa==3.1.4
-simplejson==3.6.5
-uritemplate==0.6
-mock==1.0.1
-lxml==3.4.2
 testfixtures==4.1.2
-requests==2.7.0
--e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
--e git+https://github.com/notanumber/xapian-haystack.git@a3a3a4e7cfba3e2e1be3a42abf59edd29ea03c05#egg=xapian_haystack-master
--e hg+https://bgneal@bitbucket.org/bgneal/queues@862e8846f7e5f5a0df7f08bfe4b4e5283acb4614#egg=queues-dev
-#
-# These packages I punted on and hacked into my virtualenv by
-# symlinking to the global site-packages:
-# xapian
diff -r 2908859c2fe4 -r 81b96f3c9e59 requirements_mac.txt
--- a/requirements_mac.txt	Thu Oct 29 20:54:34 2015 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-Django==1.7.10
-Markdown==2.5.1
-MySQL-python==1.2.5
-django-debug-toolbar==1.0
--e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
-django-haystack==2.1.0
-django-tagging==0.3.1
-html5lib==0.999
-bleach==1.4
-pytz==2013b
-queued-search==2.1.0
--e hg+https://bgneal@bitbucket.org/bgneal/queues@862e8846f7e5f5a0df7f08bfe4b4e5283acb4614#egg=queues-dev
-redis==2.10.3
-repoze.timeago==0.5
--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
-docutils==0.12
-amqp==1.3.3
-Fabric==1.10.1
-six==1.8.0
-pycrypto==2.6.1
-ssh==1.7.13
-ftfy==2.0.1
-Pillow==2.7.0
-boto==2.36.0
-sqlparse==0.1.10
-billiard==3.3.0.13
-google-api-python-client==1.3.1
-httplib2==0.9
-oauth2client==1.4.1
-pyasn1==0.1.7
-pyasn1-modules==0.0.5
-rsa==3.1.4
-simplejson==3.6.5
-uritemplate==0.6
-mock==1.0.1
-ecdsa==0.13
-paramiko==1.15.2
-pss==1.40
-wsgiref==0.1.2
-requests==2.7.0
-#
-# These packages I punted on and hacked into my virtualenv by
-# symlinking to the global site-packages:
-# xapian