Update django version to 2.2.9 (#578)

* Update django version to 2.2.9

* Replace django.core.urlresolvers with django.urls

* Replace --exit with --check

* Replace filter_class with filterset_class

* Update django-filter and django-nose

* Update error handler views to accept exception argument

* Update django version in docs-requirements.txt

* Update urls usage to work with django2.2

* Add app_name for orchestra

* Replace MIDDLEWARE_CLASSES with MIDDLEWARE

* Update migrations check

* Add set atomic=False

* Add renderer argument

* Replace name with field_name in filters

* Fix tests

* Fix linting error

* Add --dry-run to migrations check

* Update django-bitfield to 2.0.1

* Update ajax-selects version

Author: progremir

Makefile

@@ -14,7 +14,7 @@ lint:
 	flake8 . # && isort --check-only --recursive .
 	gulp lint --production
 	!(find . -wholename '**migrations**/*.py' -print0 | xargs -0 grep 'RemoveField\|DeleteModel\|AlterModelTable\|AlterUniqueTogether\|RunSQL\|RunPython\|SeparateDatabaseAndState' | grep -v '# manually-reviewed') || { echo "Migrations need to be manually reviewed!"; exit 1; }
-	!(cd example_project && python3 manage.py makemigrations --dry-run --exit) || { printf "Migrations need to be created. Try: \n\t python3 manage.py makemigrations\n"; exit 1; }
+	cd example_project && python3 manage.py makemigrations --dry-run --check || { printf "Migrations need to be created. Try: \n\t python3 manage.py makemigrations\n"; exit 1; }
 
 test: lint
 	cd example_project && python3 $(TEST_CMD)

docs-requirements.txt

@@ -1,5 +1,5 @@
 # Packages needed to build docs on https://readthedocs.org
-Django==1.11.10
+Django==2.2.9
 Sphinx==1.6.3
 sphinx-autobuild==0.7.1
 sphinxcontrib-httpdomain==1.5.0

example_project/example_project/settings.py

@@ -55,12 +55,11 @@
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',

orchestra/accounts/bitformfield.py

@@ -26,7 +26,7 @@ def render(self, *args, **kwargs):
 
 class BitFieldCheckboxSelectMultiple(CheckboxSelectMultipleP):
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         if isinstance(value, BitHandler):
             value = [k for k, v in value if v]
         return super().render(name, value, attrs=attrs)

orchestra/accounts/tests/test_register.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from rest_framework import status
 
 from orchestra.models import Worker

orchestra/accounts/tests/test_views.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from orchestra.models import CommunicationPreference
 from orchestra.tests.helpers import OrchestraAuthenticatedTestCase

orchestra/admin.py

@@ -4,7 +4,7 @@
 from bitfield.admin import BitFieldListFilter
 from bitfield.forms import BitFieldCheckboxSelectMultiple
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.html import format_html
 from phonenumber_field.modelfields import PhoneNumberField
 from phonenumber_field.widgets import PhoneNumberPrefixWidget

orchestra/api_urls.py

@@ -21,6 +21,8 @@
 from orchestra.views import update_timer
 from orchestra.views import upload_image
 
+app_name = 'api'
+
 urlpatterns = [
     # Interface API
     url(r'^interface/dashboard_tasks/$',

orchestra/bots/staffbot.py

@@ -2,7 +2,7 @@
 import re
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.template.loader import render_to_string
 

orchestra/bots/tests/test_views.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import Client as RequestClient
 from django.test import override_settings
 

orchestra/bots/urls.py

@@ -2,6 +2,8 @@
 
 from orchestra.bots.views import StaffBotView
 
+app_name = 'bots'
+
 urlpatterns = [
     url(r'^staffbot/$',
         StaffBotView.as_view(), name='staffbot'),

orchestra/communication/staffing.py

@@ -1,7 +1,7 @@
 from annoying.functions import get_object_or_None
 from collections import defaultdict
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.db.models import Q
 from django.utils import timezone

orchestra/communication/tests/test_views.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from orchestra.tests.helpers import OrchestraAuthenticatedTestCase
 from orchestra.tests.helpers.fixtures import StaffingResponseFactory

orchestra/communication/urls.py

@@ -4,6 +4,8 @@
 from orchestra.communication.views import available_staffing_requests
 from orchestra.communication.views import reject_staffing_request_inquiry
 
+app_name = 'communication'
+
 urlpatterns = [
     # Interface API
     url(r'^accept_staffing_request_inquiry/(?P<staffing_request_inquiry_id>[0-9]+)/$',  # noqa

orchestra/filters.py

@@ -4,8 +4,8 @@
 
 
 class TimeEntryFilter(django_filters.FilterSet):
-    min_date = django_filters.DateFilter(name='date', lookup_expr='gte')
-    max_date = django_filters.DateFilter(name='date', lookup_expr='lte')
+    min_date = django_filters.DateFilter(field_name='date', lookup_expr='gte')
+    max_date = django_filters.DateFilter(field_name='date', lookup_expr='lte')
 
     class Meta:
         model = TimeEntry

orchestra/interface_api/project_management/project_management.py

@@ -2,7 +2,7 @@
 from urllib.parse import urljoin
 
 from django.conf import settings
-from django.core import urlresolvers
+from django import urls
 from django.utils import timezone
 
 from orchestra.communication.slack import OrchestraSlackService
@@ -19,28 +19,28 @@ def project_management_information(project_id):
         Project.STATUS_CHOICES).get(project.status, None)
     project_information[project.id]['project']['admin_url'] = urljoin(
         settings.ORCHESTRA_URL,
-        urlresolvers.reverse(
+        urls.reverse(
             'admin:orchestra_project_change',
             args=(project_id,)))
 
     for slug, task in project_information[project.id]['tasks'].items():
         task['admin_url'] = urljoin(
             settings.ORCHESTRA_URL,
-            urlresolvers.reverse(
+            urls.reverse(
                 'admin:orchestra_task_change',
                 args=(task['id'],)))
 
         for assignment in task['assignments']:
             assignment['admin_url'] = urljoin(
                 settings.ORCHESTRA_URL,
-                urlresolvers.reverse(
+                urls.reverse(
                     'admin:orchestra_taskassignment_change',
                     args=(assignment['id'],)))
 
             for iteration in assignment['iterations']:
                 iteration['admin_url'] = urljoin(
                     settings.ORCHESTRA_URL,
-                    urlresolvers.reverse(
+                    urls.reverse(
                         'admin:orchestra_iteration_change',
                         args=(iteration['id'],)))
                 if not iteration['end_datetime']:

orchestra/interface_api/project_management/tests/test_project_management_api.py

@@ -3,7 +3,7 @@
 
 from django.conf import settings
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import Client
 from django.test import override_settings
 

orchestra/interface_api/project_management/urls.py

@@ -2,6 +2,8 @@
 
 from orchestra.interface_api.project_management import views
 
+app_name = 'project_management'
+
 urlpatterns = [
     url(r'^projects/$',
         views.ProjectList.as_view(),

orchestra/lookups.py

@@ -1,7 +1,7 @@
 from ajax_select import LookupChannel
 from ajax_select import register
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.utils.html import escape
 

orchestra/migrations/0060_auto_20160505_1349.py

@@ -6,6 +6,7 @@
 
 
 class Migration(migrations.Migration):
+    atomic = False
 
     dependencies = [
         ('orchestra', '0059_step_description_function'),

orchestra/project_api/tests/test_project_api.py

@@ -3,7 +3,7 @@
 
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import override_settings
 from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.test import APIClient

orchestra/project_api/views.py

@@ -2,7 +2,7 @@
 from urllib.parse import urlparse
 from urllib.parse import urlunsplit
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from jsonview.exceptions import BadRequest
 
 from orchestra.core.errors import TaskAssignmentError

orchestra/tests/test_dashboard.py

@@ -304,13 +304,13 @@ def test_submit_entry_level_task_assignment(self):
         # user 0 can't submit a task if its submission prerequisites aren't
         # complete
         step = task.step
-        step.submission_depends_on = [
+        step.submission_depends_on.set([
             Step.objects.create(
                 workflow_version=step.workflow_version,
                 slug='imaginary_test_step',
                 is_human=True,
             )
-        ]
+        ])
         step.save()
         response = self._submit_assignment(
             self.clients[0], task.id)

orchestra/tests/test_todos.py

@@ -2,7 +2,7 @@
 
 from django.utils import timezone
 from dateutil.parser import parse
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from orchestra.models import Task
 from orchestra.models import Todo

orchestra/tests/test_views.py

@@ -1,10 +1,12 @@
 import datetime
 import json
-from unittest.mock import MagicMock
+
 from unittest.mock import patch
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
+from django.test import RequestFactory
+from django.contrib.sessions.middleware import SessionMiddleware
 
 from orchestra.core.errors import TimerError
 from orchestra.models import Task
@@ -238,19 +240,26 @@ def test_get_timer(self, mock_get):
 
 class TestErrorViews(OrchestraTestCase):
 
-    def assert_error_view(self, handler, status_code):
-        request = MagicMock()
-        response = handler(request)
+    def assert_error_view(self, handler, status_code, exception=None):
+        request = RequestFactory().get('/')
+        middleware = SessionMiddleware()
+        middleware.process_request(request)
+        request.session.save()
+
+        if exception:
+            response = handler(request, exception)
+        else:
+            response = handler(request)
         self.assertEqual(response.status_code, status_code)
 
     def test_bad_request(self):
-        self.assert_error_view(bad_request, 400)
+        self.assert_error_view(bad_request, 400, exception=Exception())
 
     def test_forbidden(self):
-        self.assert_error_view(forbidden, 403)
+        self.assert_error_view(forbidden, 403, exception=Exception())
 
     def test_not_found(self):
-        self.assert_error_view(not_found, 404)
+        self.assert_error_view(not_found, 404, exception=Exception())
 
     def test_internal_server_error(self):
         self.assert_error_view(internal_server_error, 500)

orchestra/todos/urls.py

@@ -8,6 +8,8 @@
 from orchestra.todos.views import TodoListTemplateList
 import orchestra.todos.views as views
 
+app_name = 'todos'
+
 urlpatterns = [
     url(r'^todo/$',
         TodoList.as_view(), name='todos'),

orchestra/urls.py

@@ -4,6 +4,8 @@
 from orchestra.views import index
 from orchestra.views import status
 
+app_name = 'orchestra'
+
 urlpatterns = [
     url(r'^api/',
         include('orchestra.api_urls', namespace='orchestra')),

orchestra/utils/notifications.py

@@ -1,7 +1,7 @@
 from urllib.parse import urljoin
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from orchestra.communication.mail import send_mail
 from orchestra.communication.slack import OrchestraSlackService

orchestra/views.py

@@ -301,23 +301,23 @@ def error_handler(request, error_code, context):
 
 
 @requires_csrf_token
-def bad_request(request):
+def bad_request(request, exception):
     error_code = http_status.HTTP_400_BAD_REQUEST
     return error_handler(request, error_code, context={
         'page_title': '400 Bad Request',
     })
 
 
 @requires_csrf_token
-def forbidden(request):
+def forbidden(request, exception):
     error_code = http_status.HTTP_403_FORBIDDEN
     return error_handler(request, error_code, context={
         'page_title': '403 Forbidden',
     })
 
 
 @requires_csrf_token
-def not_found(request):
+def not_found(request, exception):
     error_code = http_status.HTTP_404_NOT_FOUND
     return error_handler(request, error_code, context={
         'page_title': '404 Not Found',
@@ -336,7 +336,7 @@ class TimeEntryList(generics.ListCreateAPIView):
     permission_classes = (permissions.IsAuthenticated,)
     serializer_class = TimeEntrySerializer
     filter_backends = (filters.DjangoFilterBackend,)
-    filter_class = TimeEntryFilter
+    filterset_class = TimeEntryFilter
 
     def get_queryset(self):
         """