changeset 902:4dee923a2f6d

Merge with upstream.
author Brian Neal <bgneal@gmail.com>
date Sat, 07 Mar 2015 14:56:41 -0600
parents 147a66da9cbc (diff) 62cd07bb891c (current diff)
children d75da42ba11d 90632d090bbc
files
diffstat 4 files changed, 69 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/requirements.txt	Sat Feb 28 15:43:54 2015 -0600
+++ b/requirements.txt	Sat Mar 07 14:56:41 2015 -0600
@@ -4,7 +4,6 @@
 -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==2013b0
--- a/requirements_dev.txt	Sat Feb 28 15:43:54 2015 -0600
+++ b/requirements_dev.txt	Sat Mar 07 14:56:41 2015 -0600
@@ -5,7 +5,6 @@
 -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==0.999
 bleach==1.4
 pytz==2013b0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/requirements_mac.txt	Sat Mar 07 14:56:41 2015 -0600
@@ -0,0 +1,49 @@
+Django==1.6.6
+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
+#
+# These packages I punted on and hacked into my virtualenv by
+# symlinking to the global site-packages:
+# xapian
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sg101/settings/mac.py	Sat Mar 07 14:56:41 2015 -0600
@@ -0,0 +1,20 @@
+"""
+Local Django settings.
+
+"""
+from sg101.settings.base import *
+from sg101.settings.local import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': SECRETS['DB_NAME'],
+        'USER': SECRETS['DB_USER'],
+        'PASSWORD': SECRETS['DB_PASSWORD'],
+        'OPTIONS': {
+            'unix_socket': '/tmp/mysql.sock',
+        },
+    },
+}
+
+REDIS_UNIX_SOCKET = '/tmp/redis.sock'