Resolve the warnings and required preparations for django upgrade

LEARNER-947

course_discovery/apps/api/tests/test_views.py

 import ddt
 from django.contrib.auth.models import AnonymousUser
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 
 from course_discovery.apps.api.views import api_docs_permission_denied_handler
 from course_discovery.apps.core.tests.factories import UserFactory

course_discovery/apps/api/v1/tests/test_views/test_organizations.py

 import uuid
 
-import ddt
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin
@@ -9,7 +8,6 @@ from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactor
 from course_discovery.apps.course_metadata.tests.factories import Organization, OrganizationFactory
 
 
-@ddt.ddt
 class OrganizationViewSetTests(SerializationMixin, APITestCase):
     list_path = reverse('api:v1:organization-list')
 
@@ -108,10 +106,9 @@ class OrganizationViewSetTests(SerializationMixin, APITestCase):
         self.assertEqual(response.status_code, 200)
         self.assert_response_data_valid(response, organization, many=False)
 
-    @ddt.data(123, uuid.uuid4())
-    def test_retrieve_not_found(self, organization_uuid):
+    def test_retrieve_not_found(self):
         """ Verify the endpoint returns HTTP 404 if the specified UUID does not match an organization. """
-        url = reverse('api:v1:organization-detail', kwargs={'uuid': organization_uuid})
+        url = reverse('api:v1:organization-detail', kwargs={'uuid': uuid.uuid4()})
 
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)

course_discovery/apps/api/v1/tests/test_views/test_program_types.py

-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.mixins import SerializationMixin

course_discovery/apps/api/v1/tests/test_views/test_programs.py

@@ -2,7 +2,7 @@ import urllib.parse
 
 import ddt
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.serializers import MinimalProgramSerializer

course_discovery/apps/api/v1/tests/test_views/test_search.py

@@ -4,7 +4,7 @@ import urllib.parse
 
 import ddt
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from haystack.query import SearchQuerySet
 from rest_framework.test import APITestCase
 

course_discovery/apps/api/views.py

 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 
 

course_discovery/apps/core/tests/test_lookups.py

 import json
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 

course_discovery/apps/core/tests/test_throttles.py

 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.core.models import UserThrottleRate

course_discovery/apps/core/tests/test_views.py

@@ -3,10 +3,10 @@
 import mock
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.db import DatabaseError
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.encoding import force_text
 
 from course_discovery.apps.core.constants import Status

course_discovery/apps/course_metadata/admin.py

 from django.contrib import admin, messages
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
+from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 

course_discovery/apps/course_metadata/tests/test_admin.py

@@ -2,8 +2,8 @@ import itertools
 
 import ddt
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.test import LiveServerTestCase, TestCase
+from django.urls import reverse
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC

course_discovery/apps/course_metadata/tests/test_lookups.py

@@ -2,8 +2,8 @@ import json
 from urllib.parse import quote
 
 import ddt
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.course_metadata.tests.factories import (CourseFactory, CourseRunFactory, OrganizationFactory,

course_discovery/apps/course_metadata/views.py

 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponseRedirect
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import TemplateView, UpdateView
 

course_discovery/apps/edx_catalog_extensions/api/v1/tests/test_views.py

 import datetime
 import urllib.parse
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework.test import APITestCase
 
 from course_discovery.apps.api.v1.tests.test_views.test_search import (

course_discovery/apps/ietf_language_tags/tests/test_lookups.py

 import json
 
 import ddt
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.ietf_language_tags.models import LanguageTag

course_discovery/apps/publisher/api/tests/test_views.py

@@ -6,9 +6,9 @@ import ddt
 from django.contrib.auth.models import Group
 from django.contrib.sites.models import Site
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.test import TestCase
+from django.urls import reverse
 from guardian.shortcuts import assign_perm
 from mock import mock, patch
 from opaque_keys.edx.keys import CourseKey

course_discovery/apps/publisher/emails.py

@@ -3,8 +3,8 @@ import logging
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.mail.message import EmailMultiAlternatives
-from django.core.urlresolvers import reverse
 from django.template.loader import get_template
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from opaque_keys.edx.keys import CourseKey
 

course_discovery/apps/publisher/models.py

@@ -3,8 +3,8 @@ from urllib.parse import urljoin
 
 import waffle
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.db import models
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django_extensions.db.models import TimeStampedModel

course_discovery/apps/publisher/tests/test_admin.py

 import ddt
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from guardian.shortcuts import get_group_perms
 
 from course_discovery.apps.core.tests.factories import UserFactory

course_discovery/apps/publisher/tests/test_emails.py

@@ -4,8 +4,8 @@ import mock
 from django.contrib.auth.models import Group
 from django.contrib.sites.models import Site
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from opaque_keys.edx.keys import CourseKey
 from testfixtures import LogCapture
 

course_discovery/apps/publisher/tests/test_model.py

 # pylint: disable=no-member
 import ddt
-from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.test import TestCase
+from django.urls import reverse
 from django_fsm import TransitionNotAllowed
 from guardian.shortcuts import assign_perm
 

course_discovery/apps/publisher/tests/test_utils.py

@@ -3,8 +3,8 @@ from datetime import datetime
 
 import ddt
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 from guardian.shortcuts import assign_perm
 from mock import Mock
 

course_discovery/apps/publisher/tests/test_views.py

@@ -8,10 +8,10 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.contrib.sites.models import Site
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.forms import model_to_dict
 from django.test import TestCase
+from django.urls import reverse
 from guardian.shortcuts import assign_perm
 from mock import patch
 from opaque_keys.edx.keys import CourseKey

course_discovery/apps/publisher/views.py

@@ -9,11 +9,11 @@ import waffle
 from django.contrib import messages
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.forms import model_to_dict
 from django.http import Http404, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import CreateView, DetailView, ListView, TemplateView, UpdateView, View

course_discovery/apps/publisher_comments/emails.py

@@ -2,8 +2,8 @@ import logging
 
 from django.conf import settings
 from django.core.mail.message import EmailMultiAlternatives
-from django.core.urlresolvers import reverse
 from django.template.loader import get_template
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from opaque_keys.edx.keys import CourseKey
 

course_discovery/apps/publisher_comments/tests/test_admin.py

 from django.conf import settings
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from course_discovery.apps.core.tests.factories import USER_PASSWORD, UserFactory
 from course_discovery.apps.publisher.tests import factories

course_discovery/apps/publisher_comments/tests/test_emails.py

@@ -3,8 +3,8 @@ import mock
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from opaque_keys.edx.keys import CourseKey
 from testfixtures import LogCapture
 

course_discovery/settings/test.py

@@ -5,6 +5,8 @@ INSTALLED_APPS += [
     'course_discovery.apps.edx_catalog_extensions',
 ]
 
+ALLOWED_HOSTS = ['*']
+
 DEFAULT_PARTNER_ID = 1
 
 TEST_NON_SERIALIZED_APPS = [

course_discovery/templates/publisher/_add_instructor_popup.html

@@ -5,7 +5,7 @@
         <h2 class="hd-2 emphasized new-instructor-heading">{% trans "New Instructor" %}</h2>
         <div id="modal-errors" class="alert-messages">
         </div>
-        <form class="form">
+        <form class="form" enctype="multipart/form-data">
             <fieldset class="form-group">
                 <div class="staff-image-icon">
                     <span>{% trans "Click here to upload your image" %}</span>

course_discovery/templates/publisher/admin/import_course.html

@@ -6,7 +6,7 @@
 {% endblock title %}
 
 {% block page_content %}
-        <form method="post" action="">
+        <form method="post" action="" enctype="multipart/form-data">
             {% csrf_token %}
             <div class="col col-6 help-text">
                 <label class="field-label ">{{ form.start_id.label }}</label>

course_discovery/templates/publisher/seat_form.html

@@ -10,7 +10,7 @@
         <div class="publisher-container">
             <div class="course-information">
                 <h4 class="hd-4">{% trans "Seat Form" %}</h4>
-                <form class="form" method="post" action="">
+                <form class="form" method="post" action="" enctype="multipart/form-data">
                     {% csrf_token %}
                     <fieldset class="form-group">
                         {% for field in form %}

requirements/base.txt

@@ -9,15 +9,15 @@ django-contrib-comments==1.7.2
 django-extensions==1.7.8
 django-filter==1.0.4
 django-fsm==2.4.0
-django-guardian==1.4.5
+django-guardian==1.4.8
 django-haystack==2.5.0
 django-libsass==0.7
 django-simple-history==1.8.1
 django-solo==1.1.2
-django-sortedm2m==1.3.2
-django-stdimage==2.3.3
-django-storages==1.5.0
-django-taggit==0.22.0
+django-sortedm2m==1.4.0
+django-stdimage==2.4.1
+django-storages==1.5.2
+django-taggit==0.22.1
 django-taggit-autosuggest==0.3.0
 django-taggit-serializer==0.1.5
 django-waffle==0.11.1
@@ -31,8 +31,8 @@ drf-haystack==1.6.0rc1
 dry-rest-permissions==0.1.6
 edx-auth-backends==1.1.2
 edx-ccx-keys==0.2.0
-edx-django-release-util==0.3.0
-edx-drf-extensions==1.1.1
+edx-django-release-util==0.3.1
+edx-drf-extensions==1.2.3
 edx-opaque-keys==0.3.1
 edx-rest-api-client==1.6.0
 elasticsearch>=1.0.0,<2.0.0