Merge branch 'Aufinal/django2-reverse-import' into 'master'

Préparation Django2 :  fix des imports

See merge request klub-dev-ens/gestioCOF!356

bda/views.py

@@ -10,13 +10,13 @@ from django.conf import settings
 from django.contrib import messages
 from django.core import serializers
 from django.core.exceptions import NON_FIELD_ERRORS
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.db.models import Count, Prefetch
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.defaultfilters import pluralize
+from django.urls import reverse
 from django.utils import formats, timezone
 from django.views.generic.list import ListView
 

gestioncof/admin.py

@@ -3,8 +3,8 @@ from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import Group, Permission, User
-from django.core.urlresolvers import reverse
 from django.db.models import Q
+from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 

gestioncof/views.py

@@ -12,9 +12,9 @@ from django.contrib.auth.views import (
     redirect_to_login,
 )
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse_lazy
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic import FormView

kfet/auth/signals.py

@@ -1,7 +1,7 @@
 from django.contrib import messages
 from django.contrib.auth.signals import user_logged_in
-from django.core.urlresolvers import reverse
 from django.dispatch import receiver
+from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 

kfet/auth/tests.py

@@ -2,8 +2,8 @@ from unittest import mock
 
 from django.contrib.auth.models import AnonymousUser, Group, Permission, User
 from django.core import signing
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 
 from kfet.forms import UserGroupForm
 from kfet.models import Account

kfet/auth/views.py

@@ -4,10 +4,10 @@ from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.models import Group, User
 from django.contrib.auth.views import redirect_to_login
 from django.contrib.messages.views import SuccessMessageMixin
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.db.models import Prefetch
 from django.http import QueryDict
 from django.shortcuts import redirect, render
+from django.urls import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_http_methods

kfet/tests/test_views.py

@@ -4,8 +4,8 @@ from decimal import Decimal
 from unittest import mock
 
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.test import Client, TestCase
+from django.urls import reverse
 from django.utils import timezone
 
 from ..config import kfet_config

kfet/tests/testcases.py

@@ -1,9 +1,9 @@
 from unittest import mock
 from urllib.parse import parse_qs, urlparse
 
-from django.core.urlresolvers import reverse
 from django.http import QueryDict
 from django.test import Client
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 

kfet/views.py

@@ -10,12 +10,12 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import Permission, User
 from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.db import transaction
 from django.db.models import Count, F, Prefetch, Sum
 from django.forms import formset_factory
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic import DetailView, FormView, ListView, TemplateView

requirements-devel.txt

@@ -1,6 +1,5 @@
 -r requirements.txt
 django-debug-toolbar
-django-debug-panel
 ipython
 
 # Tools

requirements.txt

@@ -1,8 +1,8 @@
 configparser==3.5.0
 Django==1.11.*
-django-autocomplete-light==3.1.3
+django-autocomplete-light==3.3.*
 django-autoslug==1.9.3
-django-cas-ng==3.5.7
+django-cas-ng==3.5.*
 django-djconfig==0.8.0
 django-recaptcha==1.4.0
 django-redis-cache==1.8.1
@@ -22,7 +22,7 @@ channels==1.1.5
 python-dateutil
 wagtail==2.3.*
 wagtailmenus==2.12.*
-wagtail-modeltranslation==0.9.*
+wagtail-modeltranslation==0.10.*
 django-cors-headers==2.2.0
 
 # Production tools