django version updated to 1.9

Author: cosmologist10

junction/base/monkey.py

@@ -36,8 +36,9 @@ def patch_urlresolvers():
 
     old_reverse = urlresolvers.reverse
 
-    def new_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current_app=None):
-        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, prefix=prefix, current_app=current_app)
+
+    def new_reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None):
+        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, current_app=current_app)
         if is_absolute_url(path):
             return path
 

junction/proposals/urls.py

@@ -2,22 +2,22 @@
 from __future__ import absolute_import, unicode_literals
 
 # Third Party Stuff
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 
 from . import comments_views, views, votes_views, dashboard
 
-comment_urls = patterns(
-    '',
+comment_urls = [
+
     url(r'^(?P<proposal_slug>[\w-]+)/create/$',
         comments_views.create_proposal_comment, name='proposal-comment-create'),
     url(r'^(?P<proposal_slug>[\w-]+)/comments/(?P<proposal_comment_id>\d+)/up-vote/$',
         votes_views.proposal_comment_up_vote, name='proposal-comment-up-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/comments/(?P<proposal_comment_id>\d+)/down-vote/$',
         votes_views.proposal_comment_down_vote, name='proposal-comment-down-vote'),
-)
+]
+
+urlpatterns = [
 
-urlpatterns = patterns(
-    '',
     # proposal urls
     url(r'^$', views.list_proposals, name='proposals-list'),
     url(r'^create/$', views.create_proposal, name='proposal-create'),
@@ -40,4 +40,4 @@
     url(r'^(?P<proposal_slug>[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/second-vote/$', votes_views.proposal_reviewer_secondary_vote,
         name='proposal-reviewer-secondary-vote'),
-)
+]

junction/schedule/urls.py

@@ -2,12 +2,11 @@
 from __future__ import absolute_import, unicode_literals
 
 # Third Party Stuff
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # schedule urls
     url(r'^dummy_schedule/$', views.dummy_schedule, name='dummy_schedule'),
-)
+]

junction/tickets/migrations/0002_auto_20170105_1713.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-01-05 11:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ticket',
+            name='email',
+            field=models.EmailField(max_length=254),
+        ),
+    ]

junction/tickets/urls.py

@@ -2,11 +2,11 @@
 from __future__ import absolute_import, unicode_literals
 
 # Third Party Stuff
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
+
     url(r'^sync_data/$', views.sync_data, name='sync_data'),
-)
+]

junction/urls.py

@@ -3,7 +3,7 @@
 
 # Third Party Stuff
 from django.conf import settings
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import RedirectView, TemplateView
@@ -33,8 +33,10 @@
 reference to them here.
 '''
 
-urlpatterns = patterns(
-    '',
+import junction.proposals.dashboard
+
+urlpatterns = [
+
     url(r'^$', HomePageView.as_view(), name="page-home"),
 
     # Django Admin
@@ -50,18 +52,18 @@
     # Proposals related
     url(r'^(?P<conference_slug>[\w-]+)/proposals/', include('junction.proposals.urls')),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/reviewers/',
-        'junction.proposals.dashboard.reviewer_comments_dashboard',
+        junction.proposals.dashboard.reviewer_comments_dashboard,
         name='proposal-reviewers-dashboard'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/proposal_state/$',
-        'junction.proposals.dashboard.proposal_state',
+        junction.proposals.dashboard.proposal_state,
         name='proposal-state'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/$',
-        'junction.proposals.dashboard.proposals_dashboard', name='proposal-dashboard'),
+        junction.proposals.dashboard.proposals_dashboard, name='proposal-dashboard'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/votes/$',
-        'junction.proposals.dashboard.reviewer_votes_dashboard',
+        junction.proposals.dashboard.reviewer_votes_dashboard,
         name='proposal-reviewer-votes-dashboard'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/votes/export/$',
-        'junction.proposals.dashboard.export_reviewer_votes',
+        junction.proposals.dashboard.export_reviewer_votes,
         name='export-reviewer-votes'),
     url(r'^feedback/(?P<schedule_item_id>\d+)/$',
         view_feedback,
@@ -100,12 +102,14 @@
         RedirectView.as_view(pattern_name="proposals-list"),
         name='conference-detail'),
 
-) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+import django.views.defaults
 
 if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^400/$', 'django.views.defaults.bad_request'),  # noqa
-        url(r'^403/$', 'django.views.defaults.permission_denied'),
-        url(r'^404/$', 'django.views.defaults.page_not_found'),
-        url(r'^500/$', 'django.views.defaults.server_error'),
-    )
+    urlpatterns += [
+        url(r'^400/$', django.views.defaults.bad_request),  # noqa
+        url(r'^403/$', django.views.defaults.permission_denied),
+        url(r'^404/$', django.views.defaults.page_not_found),
+        url(r'^500/$', django.views.defaults.server_error),
+    ]

requirements.txt

@@ -1,19 +1,19 @@
-Django==1.8.14
-celery==3.1.18
-djangorestframework==3.1.3
-django-filter==0.10.0
+Django==1.9
+celery==3.1.20
+djangorestframework==3.4
+django-filter==1.0.1
 
 # Persistent Store
 # -------------------------------------------------
-psycopg2==2.6.1
-redis==2.10.5
+psycopg2==2.6.2
+redis==2.10.0
 dj-database-url==0.4.1
 
 # Extensions
 # -------------------------------------------------
-django-extensions==1.5.5
-six==1.9.0
-django-sampledatahelper==0.3
+django-extensions==1.7.5
+six==1.10
+django-sampledatahelper==0.4
 unicode-slugify==0.1.3
 XlsxWriter==0.7.3
 arrow==0.8.0
@@ -26,26 +26,26 @@ Pillow==2.9.0
 
 # Auth
 # -------------------------------------------------
-django-allauth==0.21.0
-oauthlib==0.7.2
+django-allauth==0.24.0
+oauthlib==1.1.2
 python-openid==2.2.5
 requests==2.7.0
 requests-oauthlib==0.5.0
 
 # Admin
 # -------------------------------------------------
-django_simple_history==1.6.3
+django_simple_history==1.8.0
 
 # Frontend Helpers
 # -------------------------------------------------
-django-bootstrap3==6.1.0
+django-bootstrap3==7.1.0
 django-bootstrap-breadcrumbs==0.8
 django-flat-theme==1.1.3
 
 # Markdown Editor
 # -------------------------------------------------
 django-markdown==0.8.4
-django-pagedown==0.1.0
+django-pagedown==0.1.
 mdx-linkify==0.6
 Markdown==2.6.6
 markdown2==2.3.1

settings/common.py

@@ -18,6 +18,8 @@
 
 ADMINS = ()
 
+DEBUG = True
+
 # Absolute Url of frontend hosted site. Used to render the urls in templattes,
 # static and media files appropriately. e.g 'https://in.pycon.org/junction'
 SITE_URL = os.environ.get('SITE_URL', '').rstrip('/')
@@ -89,13 +91,24 @@
 
 INSTALLED_APPS = CORE_APPS + THIRD_PARTY_APPS + OUR_APPS
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.core.context_processors.request",
-    "django.contrib.auth.context_processors.auth",
-    "allauth.account.context_processors.account",
-    "allauth.socialaccount.context_processors.socialaccount",
-    "junction.base.context_processors.site_info",
-)
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(APP_DIR, 'templates')],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.request',
+                "django.contrib.auth.context_processors.auth",
+                "junction.base.context_processors.site_info",
+            ],
+
+            'debug': DEBUG,
+        },
+    },
+]
+
 
 AUTHENTICATION_BACKENDS = (
     # Needed to login by username in Django admin, regardless of `allauth`
@@ -190,9 +203,6 @@
 MEDIA_ROOT = join(ROOT_DIR, '.media')
 MEDIA_URL = '/m/'
 
-TEMPLATE_DIRS = (
-    os.path.join(APP_DIR, 'templates'),
-)
 
 DATABASES = {
     'default': {
@@ -209,7 +219,6 @@
     'SECRET_KEY',
     'z^bd9lk)o!03n#9e_u87zidd1zt7*^_oc4v6t!@@86vtbu0*&j')
 
-DEBUG = TEMPLATE_DEBUG = os.environ.get('DEBUG', 'on') == 'on'
 
 ALLOWED_HOSTS = []  # TODO: