Commit 463f95d5 by Clinton Blackburn

Revert "Upgraded to Django 1.7"

parent fb63e46f
......@@ -11,8 +11,8 @@ test.requirements: requirements
develop: test.requirements
pip install -q -r requirements/local.txt --exists-action w
migrate:
cd analytics_dashboard && ./manage.py migrate
syncdb:
cd analytics_dashboard && ./manage.py syncdb --migrate
clean:
find . -name '*.pyc' -delete
......
......@@ -13,7 +13,7 @@ Getting Started
3. Setup your database:
$ make migrate
$ make syncdb
4. Run the server:
......
......@@ -208,8 +208,7 @@ DJANGO_APPS = (
# Admin panel and documentation:
'django.contrib.admin',
'waffle',
'compressor',
'waffle'
)
# Apps specific for this project go here.
......@@ -274,6 +273,18 @@ TERMS_OF_SERVICE_URL = 'http://example.com/'
########## END FEEDBACK
########## SOUTH CONFIGURATION
# See: http://south.readthedocs.org/en/latest/installation.html#configuring-your-django-installation
INSTALLED_APPS += (
# Database migration helpers:
'south',
'compressor',
)
# Don't need to use South when setting up a test database.
SOUTH_TESTS_MIGRATE = False
########## END SOUTH CONFIGURATION
########## DATA API CONFIGURATION
DATA_API_URL = 'http://127.0.0.1:9001/api/v0'
DATA_API_AUTH_TOKEN = 'edx'
......
import logging
from django.template.response import TemplateResponse
from django.test import RequestFactory
from django.test import TestCase
from django.utils.unittest.case import TestCase
from testfixtures import LogCapture
from courses.exceptions import PermissionsRetrievalFailedError
from courses.middleware import CourseMiddleware, CoursePermissionsExceptionMiddleware
......
Django==1.7 # BSD License
Django==1.6.6 # BSD License
South==1.0 # Apache License
bpython==0.12 # MIT License
django-braces==1.2.2 # BSD
django-libsass==0.2 # BSD
......
# Local development dependencies go here
-r base.txt
django-debug-toolbar==1.2.1
django-debug-toolbar==1.0.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment