Merge pull request #198 from edx/django-1.7

Upgraded to Django 1.7

.travis.yml

@@ -12,7 +12,7 @@ install:
     - pip install coveralls
 script: 
     - make validate
-    - make generate_fake_translations
+    - DJANGO_SETTINGS_MODULE="analytics_dashboard.settings.local" PYTHONPATH="$(pwd)/analytics_dashboard:$PYTHONPATH" make generate_fake_translations
     - bash ./runAcceptance.sh
 after_success:
     - coveralls

Makefile

@@ -25,8 +25,8 @@ test.acceptance: develop
 	git clone https://github.com/edx/edx-analytics-data-api.git
 	pip install -q -r edx-analytics-data-api/requirements/base.txt
 
-syncdb:
-	cd analytics_dashboard && ./manage.py syncdb --migrate
+migrate:
+	cd analytics_dashboard && ./manage.py migrate
 
 clean:
 	find . -name '*.pyc' -delete

README.md

@@ -19,7 +19,7 @@ Getting Started
 
 3. Setup your database:
 
-        $ make syncdb
+        $ make migrate
 
 4. Run the server:
 

analytics_dashboard/analytics_dashboard/settings/base.py

@@ -216,6 +216,7 @@ DJANGO_APPS = (
     'waffle',
     'django_countries',
     'announcements',
+    'compressor',
 )
 
 # Apps specific for this project go here.
@@ -292,17 +293,6 @@ DOCUMENTATION_LOAD_ERROR_MESSAGE = '<a href="{error_documentation_link}" target=
 
 ########## 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'

analytics_dashboard/analytics_dashboard/tests/test_utils.py

@@ -3,7 +3,7 @@ import uuid
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.test.utils import override_settings
-from django.utils.unittest.case import TestCase
+from django.test import TestCase
 
 from analytics_dashboard.utils import delete_auto_auth_users
 

analytics_dashboard/analytics_dashboard/urls.py

 # pylint: disable=line-too-long,no-value-for-parameter
+import os
 
 from django.conf.urls import patterns, include, url
 from django.conf import settings
@@ -30,17 +31,23 @@ urlpatterns = patterns(
     url(r'^accounts/logout/$', views.logout, name='logout'),
     url(r'^accounts/logout_then_login/$', views.logout_then_login, name='logout_then_login'),
     url(r'^test/auto_auth/$', views.AutoAuth.as_view(), name='auto_auth'),
-    url(r'^auth/error/$', 'django.views.defaults.server_error', {'template_name': 'auth_error.html'}, name='auth_error'),
+    url(r'^auth/error/$', 'django.views.defaults.server_error', {'template_name': 'auth_error.html'},
+        name='auth_error'),
     url(r'^announcements/', include('announcements.urls')),
 )
 
 if settings.DEBUG:  # pragma: no cover
-    import debug_toolbar    # pylint: disable=import-error
-
     urlpatterns += patterns(
         '',
-        url(r'^__debug__/', include(debug_toolbar.urls)),
         url(r'^403/$', 'django.views.defaults.permission_denied'),
         url(r'^404/$', 'django.views.defaults.page_not_found'),
         url(r'^500/$', 'django.views.defaults.server_error'),
     )
+
+    if os.environ.get('ENABLE_DJANGO_TOOLBAR', False):
+        import debug_toolbar  # pylint: disable=import-error
+
+        urlpatterns += patterns(
+            '',
+            url(r'^__debug__/', include(debug_toolbar.urls)),
+        )

analytics_dashboard/courses/templates/courses/index.html

@@ -39,7 +39,7 @@
           <a class="feedback-email" href="mailto:{{ feedback_email }}?Subject=Feedback">
             {{ feedback_email }}</a>{% endcaptureas %}
 
-        <p class="info-text">{% blocktrans %} Click Help in the upper-right corner to get more information
+        <p class="info-text">{% blocktrans trimmed %} Click Help in the upper-right corner to get more information
             about {{ application_name }}. Send us feedback at {{email_link}}.{% endblocktrans %}</p>
       </div>
     </div>

analytics_dashboard/courses/tests/test_middleware.py

 import logging
+
 from django.template.response import TemplateResponse
-from django.test import RequestFactory
-from django.utils.unittest.case import TestCase
+from django.test import RequestFactory, TestCase
 from opaque_keys.edx.keys import CourseKey
 from testfixtures import LogCapture
+
 from courses.exceptions import PermissionsRetrievalFailedError
 from courses.middleware import CourseMiddleware, CoursePermissionsExceptionMiddleware
 

analytics_dashboard/templates/footer.html

@@ -14,7 +14,7 @@
         {% captureas email_link %}
           <a class="feedback-email" href="mailto:{{ feedback_email }}?Subject=Feedback">{{ feedback_email }}</a>
         {% endcaptureas %}
-        {% blocktrans %}We want this dashboard to work for you! Need help? {{ support_link_start }}Visit our support
+        {% blocktrans trimmed %}We want this dashboard to work for you! Need help? {{ support_link_start }}Visit our support
           forum{{ support_link_end }}. Comments or suggestions? Email {{ email_link }}.{% endblocktrans %}
       </div>
     </div>

bower.json

@@ -27,5 +27,8 @@
     "datatables": "~1.10.2",
     "font-awesome": "~4.2.0",
     "natural-sort": "overset/javascript-natural-sort#dbf4ca259b327a488bd1d7897fd46d80c414a7e0"
+  },
+  "resolutions": {
+    "cldrjs": "0.3.9"
   }
 }

requirements/base.txt

-Django==1.6.6				# BSD License
-South==1.0					# Apache License
+Django==1.7.1				# BSD License
 bpython==0.12				# MIT License
 django-braces==1.2.2		# BSD
 
@@ -14,7 +13,7 @@ logutils==0.3.3				# BSD
 python-social-auth==0.2.0   # BSD
 django-waffle==0.10			# BSD
 django-countries<3.0.0      # MIT
-django-announcements==1.2.0 # MIT
+-e git+https://github.com/clintonb/django-announcements.git@e5c4ef825111befdc2dd2b206fbb322367ae5a3e#egg=django-announcements # MIT
 -e git+https://github.com/edx/edx-analytics-data-api-client.git@0.3.0#egg=edx-analytics-data-api-client # edX
 -e git+https://github.com/edx/django-lang-pref-middleware.git@0.1.0#egg=django-lang-pref-middleware
 -e git+https://github.com/edx/i18n-tools.git@0d7847f9dfa2281640527b4dc51f5854f950f9b7#egg=i18n_tools

requirements/local.txt

 # Local development dependencies go here
 -r base.txt
-django-debug-toolbar==1.0.1
+django-debug-toolbar==1.2.2
 transifex-client==0.10

runAcceptance.sh

@@ -18,8 +18,8 @@ export ENABLE_AUTO_AUTH=True
 export ENABLE_AUTH_TESTS=False
 export ENABLE_ERROR_PAGE_TESTS=False
 
-echo "Syncing Analytics Dashboard DB..."
-make syncdb
+echo "Migrating Analytics Dashboard DB..."
+make migrate
 
 echo "Preparing Analytics Data API..."
 cd edx-analytics-data-api/