Skip to content

Commit d4e0ae2

Browse files
authored
Merge pull request #67 from simobasso/upgrade_django2
requirements: upgrade django 1.11.6 > 2.0.1
2 parents 8ceefb0 + 968530a commit d4e0ae2

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

backend/pycon/settings/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.core.urlresolvers import reverse_lazy
1+
from django.urls import reverse_lazy
22

33
import environ
44
root = environ.Path(__file__) - 3 # three folder back (/a/b/c/ - 3 = /)

backend/pycon/urls.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from django.conf.urls import url, include
1+
from django.urls import path, include
22
from django.contrib import admin
33

44
from graphene_django.views import GraphQLView
55

66
urlpatterns = [
7-
url(r'^admin/', admin.site.urls),
8-
url(r'^graphql', GraphQLView.as_view(graphiql=True)),
9-
url('', include('social_django.urls', namespace='social')),
10-
url('user/', include('users.urls')),
7+
path('admin/', admin.site.urls),
8+
path('graphql', GraphQLView.as_view(graphiql=True)),
9+
path('', include('social_django.urls', namespace='social')),
10+
path('user/', include('users.urls')),
1111
]

backend/requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django==1.11.6
1+
Django==2.0.1
22
django-environ==0.4.4
33
graphene-django==2.0.0
44
social-auth-app-django==2.1.0

backend/users/urls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from django.conf import settings
2-
from django.conf.urls import url
2+
from django.urls import path
33

44
from .views import post_login_view
55

66
urlpatterns = [
7-
url(r'post-login', post_login_view, name='post-login'),
7+
path('post-login', post_login_view, name='post-login'),
88
]
99

1010
if settings.DEBUG:
1111
from django.views.generic import TemplateView
1212

1313
urlpatterns += [
14-
url(r'demo-login/',
14+
path('demo-login/',
1515
TemplateView.as_view(template_name='users/test-login.html')),
1616
]

0 commit comments

Comments
 (0)