upgrade django to 1.10.7

Upgrade django to the newer version Django has been updated to 1.11.X so this is one step towards the newer version LEARNER-946

upgrade django to 1.10.7
Upgrade django to the newer version Django has been updated to 1.11.X so this is one step towards the newer version LEARNER-946
8ecea60a · Ahsan Ulhaq · 7ea762eb · 8ecea60a · 8ecea60a · 8ecea60a
Commit 8ecea60a authored May 18, 2017 by Ahsan Ulhaq
20 changed files
--- a/course_discovery/apps/api/v1/tests/test_views/test_catalogs.py
+++ b/course_discovery/apps/api/v1/tests/test_views/test_catalogs.py
@@ -172,7 +172,7 @@ class CatalogViewSetTests(ElasticsearchTestMixin, SerializationMixin, OAuth2Mixi
                # to be included.
                filtered_course_run = CourseRunFactory(course=course)

-                with self.assertNumQueries(19):
+                with self.assertNumQueries(16):
                    response = self.client.get(url)

                assert response.status_code == 200

--- a/course_discovery/apps/api/v1/tests/test_views/test_programs.py
+++ b/course_discovery/apps/api/v1/tests/test_views/test_programs.py
@@ -73,7 +73,7 @@ class ProgramViewSetTests(SerializationMixin, APITestCase):
    def test_retrieve(self):
        """ Verify the endpoint returns the details for a single program. """
        program = self.create_program()
-        with self.assertNumQueries(42):
+        with self.assertNumQueries(37):
            response = self.assert_retrieve_success(program)
        # property does not have the right values while being indexed
        del program._course_run_weeks_to_complete
@@ -96,7 +96,7 @@ class ProgramViewSetTests(SerializationMixin, APITestCase):
        program = ProgramFactory(courses=course_list, order_courses_by_start_date=order_courses_by_start_date)
        # property does not have the right values while being indexed
        del program._course_run_weeks_to_complete
-        with self.assertNumQueries(29):
+        with self.assertNumQueries(26):
            response = self.assert_retrieve_success(program)
        assert response.data == self.serialize_program(program)
        self.assertEqual(course_list, list(program.courses.all()))  # pylint: disable=no-member
@@ -135,7 +135,7 @@ class ProgramViewSetTests(SerializationMixin, APITestCase):
        """ Verify the endpoint returns a list of all programs. """
        expected = [self.create_program() for __ in range(3)]
        expected.reverse()
-        self.assert_list_results(self.list_path, expected, 13)
+        self.assert_list_results(self.list_path, expected, 12)

        # Verify that repeated list requests use the cache.
        self.assert_list_results(self.list_path, expected, 2)
@@ -230,7 +230,7 @@ class ProgramViewSetTests(SerializationMixin, APITestCase):
        """ Verify the endpoint returns marketing URLs without UTM parameters. """
        url = self.list_path + '?exclude_utm=1'
        program = self.create_program()
-        self.assert_list_results(url, [program], 13, extra_context={'exclude_utm': 1})
+        self.assert_list_results(url, [program], 12, extra_context={'exclude_utm': 1})

    def test_minimal_serializer_use(self):
        """ Verify that the list view uses the minimal serializer. """

--- a/course_discovery/apps/course_metadata/tests/factories.py
+++ b/course_discovery/apps/course_metadata/tests/factories.py
@@ -73,7 +73,6 @@ class CourseFactory(factory.DjangoModelFactory):
    level_type = factory.SubFactory(LevelTypeFactory)
    card_image_url = FuzzyURL()
    video = factory.SubFactory(VideoFactory)
-    marketing_url = FuzzyText(prefix='https://example.com/test-course-url')
    partner = factory.SubFactory(PartnerFactory)

    class Meta:

--- a/course_discovery/apps/publisher/tests/test_views.py
+++ b/course_discovery/apps/publisher/tests/test_views.py
@@ -178,7 +178,7 @@ class CreateCourseViewTests(TestCase):

        self.assertContains(
            response,
-            '<select class="field-input input-select" id="id_organization" name="organization">'
+            '<select class="field-input input-select" id="id_organization" name="organization" required>'
        )

        new_organization_extension = factories.OrganizationExtensionFactory()

--- a/course_discovery/templates/base.html
+++ b/course_discovery/templates/base.html
 {# Base template for edX-specific pages. #}

 {% load compress %}
-{% load staticfiles %}
+{% load static %}

 <!DOCTYPE html>
 <html>

--- a/course_discovery/templates/demo/query_preview.html
+++ b/course_discovery/templates/demo/query_preview.html
-{% load staticfiles %}
+{% load static %}

 <!DOCTYPE html>
 <html lang="en">

--- a/course_discovery/templates/publisher/_header.html
+++ b/course_discovery/templates/publisher/_header.html
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 <header class="header">
    <div class="layout-1q1h1q layout-flush layout-header">

--- a/course_discovery/templates/publisher/add_course_form.html
+++ b/course_discovery/templates/publisher/add_course_form.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
    {% trans "Create New Course" %}

--- a/course_discovery/templates/publisher/add_courserun_form.html
+++ b/course_discovery/templates/publisher/add_courserun_form.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
    {% trans "New Course Run" %}

--- a/course_discovery/templates/publisher/base.html
+++ b/course_discovery/templates/publisher/base.html
@@ -2,7 +2,7 @@

 {% load compress %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block stylesheets %}
    {{ block.super }}

--- a/course_discovery/templates/publisher/course_detail.html
+++ b/course_discovery/templates/publisher/course_detail.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}
    {% trans "Course Detail" %}
 {% endblock title %}

--- a/course_discovery/templates/publisher/course_edit_form.html
+++ b/course_discovery/templates/publisher/course_edit_form.html
 {% extends 'publisher/base.html' %}

 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
    {% trans "Edit Course" %}

--- a/course_discovery/templates/publisher/course_revision_history.html
+++ b/course_discovery/templates/publisher/course_revision_history.html
 {% extends 'base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load compress %}

 {% block title %}

--- a/course_discovery/templates/publisher/course_run/edit_run_form.html
+++ b/course_discovery/templates/publisher/course_run/edit_run_form.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
    {% trans "Edit Course Run" %}

--- a/course_discovery/templates/publisher/course_run_detail/_instructor_profile.html
+++ b/course_discovery/templates/publisher/course_run_detail/_instructor_profile.html
 {% load compress %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 <div id="instructorProfileModal" class="modal">
    <div class="modal-content course-information">

--- a/course_discovery/templates/publisher/course_run_detail/course_run_detail.html
+++ b/course_discovery/templates/publisher/course_run_detail/course_run_detail.html
@@ -2,7 +2,7 @@

 {% load compress %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
    {% trans "Course Run Details" %}

--- a/course_discovery/templates/publisher/dashboard.html
+++ b/course_discovery/templates/publisher/dashboard.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}

 {% block title %}
 {% trans "Dashboard" %}

--- a/course_discovery/templates/publisher/seat_form.html
+++ b/course_discovery/templates/publisher/seat_form.html
 {% extends 'publisher/base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}
    {% trans "Seat Form" %}
 {% endblock title %}

--- a/course_discovery/templates/rest_framework_swagger/index.html
+++ b/course_discovery/templates/rest_framework_swagger/index.html
 {% extends 'rest_framework_swagger/base.html' %}

-{% load staticfiles %}
+{% load static %}

 {% block style %}
    {{ block.super }}

--- a/requirements/base.txt
+++ b/requirements/base.txt
 beautifulsoup4==4.5.1
 boto==2.42.0
 cryptography==1.7.1
-django==1.9.13
+django==1.10.7
 django-autocomplete-light==3.1.8
 django-choices==1.4.3
-django-compressor==2.0
+django-compressor==2.1.1
 django-contrib-comments==1.7.2
 django-extensions==1.7.8
 django-filter==0.14.0