From 8bfe18b52ad1a48abe5ae0346b19a96a596aec64 Mon Sep 17 00:00:00 2001
From: Dayson Pais <dayson@crowdfireapp.com>
Date: Sat, 30 Dec 2017 12:16:19 +0530
Subject: [PATCH] Update django from 1.11.8 to 2.0

- Refactor django.core.urlresolvers module import to django.urls. Resolves: The django.core.urlresolvers module is removed in favor of its new location, django.urls.

- Add an app namespace to urls in user app. Resolves: Support for setting a URL instance namespace without an application namespace is removed.
---
 {{cookiecutter.project_slug}}/requirements/base.txt             | 2 +-
 .../{{cookiecutter.project_slug}}/users/models.py               | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/test_urls.py      | 2 +-
 .../{{cookiecutter.project_slug}}/users/urls.py                 | 1 +
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 369d8464..3eb0ae55 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -6,7 +6,7 @@ wheel==0.30.0
 
 
 # Conservative Django
-django==1.11.8 # pyup: <2.0
+django==2.0 # pyup: <2.0
 
 # Configuration
 django-environ==0.4.4
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index c06f15da..91582365 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -1,5 +1,5 @@
 from django.contrib.auth.models import AbstractUser
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 6e181cc8..4935b0f3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse, resolve
+from django.urls import reverse, resolve
 
 from test_plus.test import TestCase
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index 600ccfbd..7c83fab9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -2,6 +2,7 @@ from django.conf.urls import url
 
 from . import views
 
+app_name = 'users'
 urlpatterns = [
     url(
         regex=r'^$',
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 777f42b7..7fa94c23 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.views.generic import DetailView, ListView, RedirectView, UpdateView
 
 from django.contrib.auth.mixins import LoginRequiredMixin