rm debug_toolbar from sandbox, update zipstream to follow the github version

diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py
index c1bbc2eab765d437d3a81277a02a06a9e8687f30..dbdc53ae424ac4b19f6481ad6bb6eedbe9a6578a 100644 (file)
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@ -104,7 +104,6 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ROOT_URLCONF = 'sandbox.urls'
@@ -131,7 +130,6 @@ INSTALLED_APPS = (
     'sorl.thumbnail',
     'timezones',
     'jqchat',
-    'debug_toolbar',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/setup.py b/setup.py
index 1b64355fe00e5e8547fcf4f6f28478df4c9dbdbc..75ea190b8909f0c010b96da17fa2839c0ccc8ad0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ setup(
   author_email = "yomguy@parisson.com",
   version = '1.4.6',
   install_requires = [
-        'django==1.4.5',
+        'django==1.4.10',
         'django-registration',
         'django-json-rpc',
         'numpy',
@@ -40,9 +40,10 @@ setup(
         'psutil',
         'pyyaml',
         'python-ebml',
-        'zipstream',
-        'django-debug-toolbar',
   ],
+  dependency_links=[
+        "git+ssh://git@github.com:yomguy/python-zipstream.git@1.0.3#egg=zipstream=1.0.3"
+    ]
   platforms=['OS Independent'],
   license='CeCILL v2',
   classifiers = CLASSIFIERS,