Upgraded to Django 1.7

edx · Nov 13, 2014 · af79e1d · af79e1d
1 parent 9b23fed
commit af79e1d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ COVERAGE = $(ROOT)/build/coverage
 PACKAGES = analyticsdataserver analytics_data_api
 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:
 	pip install -q -r requirements/base.txt
@@ -46,17 +46,17 @@ quality:
 
 validate: test.requirements test quality
 
-syncdb:
-	$(foreach db_name,$(DATABASES),./manage.py syncdb --migrate --noinput --database=$(db_name);)
+migrate:
+	$(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 generate_fake_course_data
 
 demo: clean requirements loaddata
 	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 loaddata problem_response_answer_distribution --database=analytics
 	python manage.py generate_fake_course_data --num-weeks=1
diff --git a/README.rst b/README.rst
@@ -26,8 +26,8 @@ Getting Started
 
    ::
 
-       $ ./manage.py syncdb --migrate --noinput
-       $ ./manage.py syncdb --migrate --noinput --database=analytics
+       $ ./manage.py migrate --noinput
+       $ ./manage.py migrate --noinput --database=analytics
 
 3. Create a user and authentication token. Note that the user will be
    created if one does not exist.

diff --git a/analyticsdataserver/router.py b/analyticsdataserver/router.py
@@ -17,7 +17,7 @@ def db_for_write(self, model, **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)
 
-    def allow_syncdb(self, database, model):
+    def allow_migrate(self, database, model):
         dest_db = self._get_database(model)
         if dest_db is not None:
             return database == dest_db

diff --git a/analyticsdataserver/settings/base.py b/analyticsdataserver/settings/base.py
@@ -181,7 +181,6 @@
 )
 
 THIRD_PARTY_APPS = (
-    'south',
     'rest_framework',
     'rest_framework.authtoken',
     'rest_framework_swagger',

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,6 +1,5 @@
-Django==1.6.6 						# BSD License
+Django==1.7.1 						# BSD License
 Markdown==2.4.1 					# BSD
-South==1.0   						# Apache License
 django-model-utils==1.4.0 			# BSD
 djangorestframework==2.4.4			# BSD
 ipython==2.1.0						# BSD

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -1,3 +1,3 @@
 # Local development dependencies go here
 -r base.txt
-django-debug-toolbar==1.2.1
+django-debug-toolbar==1.2.2