Merge pull request #512 from codesy/update-Django-1.11.4

Update django to 1.11.4

api/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from rest_framework import routers
 
@@ -14,11 +14,10 @@
 router.register(r'payouts', views.UserViewSet)
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^', include(router.urls)),
     url(
         r'^api-auth/',
         include('rest_framework.urls', namespace='rest_framework')
     )
-)
+]

auctions/urls.py

@@ -1,14 +1,13 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^addon-login', views.AddonLogin.as_view()),
     url(r'^bid-status/', views.BidStatusView.as_view(), name='bid-status'),
     url(r'^claim-status/(?P<pk>[^/.]+)',
         views.ClaimStatusView.as_view(), name='claim-status'),
     url(r'^bid-list', views.BidList.as_view()),
     url(r'^claim-list', views.ClaimList.as_view()),
     url(r'^vote-list', views.VoteList.as_view()),
-)
+]

codesy/base/migrations/0024_auto_20170904_2047.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-04 20:47
+from __future__ import unicode_literals
+
+import django.contrib.auth.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0023_auto_20170415_2154'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
+        ),
+    ]

codesy/settings.py

@@ -76,17 +76,22 @@
 )
 
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'codesy.context_processors.conf_settings',
-    'codesy.context_processors.current_site',
-    'django.core.context_processors.request',
-    'django.contrib.auth.context_processors.auth',
-    'django.contrib.messages.context_processors.messages',
-)
-
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, 'codesy/templates'),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': [os.path.join(BASE_DIR, 'codesy/templates'), ],
+        'OPTIONS': {
+            'context_processors': [
+                'codesy.context_processors.conf_settings',
+                'codesy.context_processors.current_site',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages'
+            ]
+        }
+    }
+]
 
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

codesy/urls.py

@@ -1,21 +1,18 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
+from django.contrib.auth.views import LogoutView
 
 from . import views
 
 admin.site.site_header = u'Codesy administration'
 admin.site.site_title = u'Codesy site admin'
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # Static home/ explanation pages
     url(r'^$', views.Home.as_view(), name='home'),
     url(r'^legal-info$', views.LegalInfo.as_view(), name='legal-info'),
     # allauth
-    (
-        r'^accounts/logout/$', 'django.contrib.auth.views.logout',
-        {'next_page': '/'}
-    ),
+    url(r'^accounts/logout/$', LogoutView.as_view(), {'next_page': '/'}),
     url(r'^accounts/', include('allauth.urls')),
 
     # admin site
@@ -32,4 +29,4 @@
 
     # auctions API
     url(r'^', include('api.urls')),
-)
+]

payments/urls.py

@@ -1,12 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^events$', views.StripeHookView.as_view(), name='events'),
     url(r'^terms$', views.AcceptTermsView.as_view(), name='terms'),
     url(r'^identity$', views.VerifyIdentityView.as_view(), name='identity'),
     url(r'^bank$', views.BankAccountView.as_view(), name='bank'),
     url(r'^card$', views.CreditCardView.as_view(), name='card'),
-
-)
+]

requirements-dev.txt

@@ -1,3 +1,5 @@
+-r requirements.txt
+
 ipdb==0.9.0
 ipython==4.1.2
 Sphinx==1.3.6

requirements-test.txt

@@ -1,9 +1,9 @@
 -r requirements.txt
 
 coverage==4.2
-django-nose==1.4.3
+django-nose==1.4.5
 flake8==3.2.0
 fudge==1.1.0
 funcsigs==0.4
 mock==1.3.0
-model-mommy==1.2.6
+model-mommy==1.4.0

requirements.txt

@@ -1,14 +1,14 @@
-Django==1.9.13
+Django==1.11.4
 PyGithub==1.26.0
 dj-database-url==0.4.0
 dj-static==0.0.6
 django-allauth==0.24.1
 django-csp==3.1
 django-cors-headers==1.1.0
-django-mailer==1.1
+django-mailer==1.2.2
 django-toolbelt==0.0.1
-django-rest-swagger==0.3.5
-djangorestframework==3.3.2
+django-rest-swagger==0.3.10
+djangorestframework==3.5.4
 gunicorn==19.4.5
 newrelic==2.60.0.46
 oauthlib==1.0.3