Commit bf4f5ba3 by Clinton Blackburn

Merge pull request #41 from edx/django-1.7

Upgraded to Django 1.7
parents cd13fc88 af79e1d8
...@@ -4,7 +4,7 @@ COVERAGE = $(ROOT)/build/coverage ...@@ -4,7 +4,7 @@ COVERAGE = $(ROOT)/build/coverage
PACKAGES = analyticsdataserver analytics_data_api PACKAGES = analyticsdataserver analytics_data_api
DATABASES = default analytics DATABASES = default analytics
.PHONY: requirements develop clean diff.report view.diff.report quality syncdb .PHONY: requirements develop clean diff.report view.diff.report quality
requirements: requirements:
pip install -q -r requirements/base.txt pip install -q -r requirements/base.txt
...@@ -46,17 +46,17 @@ quality: ...@@ -46,17 +46,17 @@ quality:
validate: test.requirements test quality validate: test.requirements test quality
syncdb: migrate:
$(foreach db_name,$(DATABASES),./manage.py syncdb --migrate --noinput --database=$(db_name);) $(foreach db_name,$(DATABASES),./manage.py migrate --noinput --database=$(db_name);)
loaddata: syncdb loaddata: migrate
python manage.py loaddata problem_response_answer_distribution --database=analytics python manage.py loaddata problem_response_answer_distribution --database=analytics
python manage.py generate_fake_course_data python manage.py generate_fake_course_data
demo: clean requirements loaddata demo: clean requirements loaddata
python manage.py set_api_key edx edx python manage.py set_api_key edx edx
travis: clean requirements syncdb travis: clean requirements migrate
python manage.py set_api_key edx edx python manage.py set_api_key edx edx
python manage.py loaddata problem_response_answer_distribution --database=analytics python manage.py loaddata problem_response_answer_distribution --database=analytics
python manage.py generate_fake_course_data --num-weeks=1 python manage.py generate_fake_course_data --num-weeks=1
...@@ -26,8 +26,8 @@ Getting Started ...@@ -26,8 +26,8 @@ Getting Started
:: ::
$ ./manage.py syncdb --migrate --noinput $ ./manage.py migrate --noinput
$ ./manage.py syncdb --migrate --noinput --database=analytics $ ./manage.py migrate --noinput --database=analytics
3. Create a user and authentication token. Note that the user will be 3. Create a user and authentication token. Note that the user will be
created if one does not exist. created if one does not exist.
......
...@@ -17,7 +17,7 @@ class AnalyticsApiRouter(object): ...@@ -17,7 +17,7 @@ class AnalyticsApiRouter(object):
def allow_relation(self, obj1, obj2, **hints): # pylint: disable=unused-argument def allow_relation(self, obj1, obj2, **hints): # pylint: disable=unused-argument
return self._get_database(obj1) == self._get_database(obj2) return self._get_database(obj1) == self._get_database(obj2)
def allow_syncdb(self, database, model): def allow_migrate(self, database, model):
dest_db = self._get_database(model) dest_db = self._get_database(model)
if dest_db is not None: if dest_db is not None:
return database == dest_db return database == dest_db
......
...@@ -181,7 +181,6 @@ DJANGO_APPS = ( ...@@ -181,7 +181,6 @@ DJANGO_APPS = (
) )
THIRD_PARTY_APPS = ( THIRD_PARTY_APPS = (
'south',
'rest_framework', 'rest_framework',
'rest_framework.authtoken', 'rest_framework.authtoken',
'rest_framework_swagger', 'rest_framework_swagger',
......
Django==1.6.6 # BSD License Django==1.7.1 # BSD License
Markdown==2.4.1 # BSD Markdown==2.4.1 # BSD
South==1.0 # Apache License
django-model-utils==1.4.0 # BSD django-model-utils==1.4.0 # BSD
djangorestframework==2.4.4 # BSD djangorestframework==2.4.4 # BSD
ipython==2.1.0 # BSD ipython==2.1.0 # BSD
......
# Local development dependencies go here # Local development dependencies go here
-r base.txt -r base.txt
django-debug-toolbar==1.2.1 django-debug-toolbar==1.2.2
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