Merge pull request #522 from cosmologist10/docs

kracekumar · web-flow · commit 4663a7e1def4 · 2017-04-12T01:14:17.000+05:30
Django version upgraded from 1.8 to 1.9
diff --git a/junction/base/monkey.py b/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
 
diff --git a/junction/proposals/urls.py b/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'),
-)
+]
diff --git a/junction/schedule/urls.py b/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'),
-)
+]
diff --git a/junction/templates/account/email.html b/junction/templates/account/email.html
@@ -1,6 +1,6 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/email_confirm.html b/junction/templates/account/email_confirm.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load account %}
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/account/login.html b/junction/templates/account/login.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load account %}
 {% load django_bootstrap_breadcrumbs %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Sign In" %} · {{ block.super }}{% endblock %}
 
diff --git a/junction/templates/account/logout.html b/junction/templates/account/logout.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/account/password_change.html b/junction/templates/account/password_change.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/password_reset.html b/junction/templates/account/password_reset.html
@@ -1,7 +1,7 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block head_title %}{% trans "Password Reset" %} · {{ block.super }}{% endblock %}
diff --git a/junction/templates/account/password_reset_from_key.html b/junction/templates/account/password_reset_from_key.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 {% load i18n %}
 
diff --git a/junction/templates/account/password_reset_from_key_done.html b/junction/templates/account/password_reset_from_key_done.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 {% load i18n %}
 
diff --git a/junction/templates/account/password_set.html b/junction/templates/account/password_set.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load django_bootstrap_breadcrumbs %}
 
diff --git a/junction/templates/account/signup.html b/junction/templates/account/signup.html
@@ -1,6 +1,6 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block head_title %}{% trans "Sign Up" %} · {{ block.super }}{% endblock %}
diff --git a/junction/templates/account/signup_closed.html b/junction/templates/account/signup_closed.html
@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}
diff --git a/junction/templates/account/verified_email_required.html b/junction/templates/account/verified_email_required.html
@@ -1,5 +1,4 @@
 {% extends "account/base.html" %}
-{% load url from future %}
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}
@@ -33,6 +32,3 @@ <h2 class="fill-blue text-center">{% trans "Verify Your E-mail Address" %}</h2>
         </div>
     </div>
 {% endblock %}
-
-
-
diff --git a/junction/templates/openid/login.html b/junction/templates/openid/login.html
@@ -1,5 +1,5 @@
 {% extends "openid/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}OpenID Sign In{% endblock %}
diff --git a/junction/templates/proposals/closed.html b/junction/templates/proposals/closed.html
@@ -2,7 +2,6 @@
 {% load bootstrap3 %}
 {% load static from staticfiles %}
 {% load django_bootstrap_breadcrumbs %}
-{% load url from future %}
 {% load i18n %}
 
 {% block head_title %} CFP submission is closed | {{ block.super }} {% endblock %}
@@ -20,7 +19,7 @@
             <div class="form-container space-2-bottom">
                 <h2 class="fill-blue text-center">{% trans "CFP submission is closed" %}</h2>
                 <div class="pad-2 push-1-top push-2-bottom text-center">
-    				<p>{% trans "We are no longer accepting proposals. You can prepare a session for open spaces or flash talks." %}</p>
+                    <p>{% trans "We are no longer accepting proposals. You can prepare a session for open spaces or flash talks." %}</p>
                 </div>
             </div>
         </div>
diff --git a/junction/templates/socialaccount/connections.html b/junction/templates/socialaccount/connections.html
@@ -1,6 +1,6 @@
 {% extends "socialaccount/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
diff --git a/junction/templates/socialaccount/login_cancelled.html b/junction/templates/socialaccount/login_cancelled.html
@@ -1,5 +1,5 @@
 {% extends "socialaccount/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}{% trans "Login Cancelled" %}{% endblock %}
diff --git a/junction/templates/socialaccount/signup.html b/junction/templates/socialaccount/signup.html
@@ -1,5 +1,5 @@
 {% extends "socialaccount/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% block head_title %}{% trans "Signup" %}{% endblock %}
diff --git a/junction/tickets/migrations/0002_auto_20170105_1713.py b/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),
+        ),
+    ]
diff --git a/junction/tickets/migrations/0002_auto_20170404_2243.py b/junction/tickets/migrations/0002_auto_20170404_2243.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+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),
+        ),
+    ]
diff --git a/junction/tickets/migrations/0003_merge.py b/junction/tickets/migrations/0003_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-03-20 17:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0002_auto_20170105_1713'),
+        ('tickets', '0002_auto_20170104_0124'),
+    ]
+
+    operations = [
+    ]
diff --git a/junction/tickets/migrations/0004_merge.py b/junction/tickets/migrations/0004_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-04-05 17:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tickets', '0003_merge'),
+        ('tickets', '0002_auto_20170404_2243'),
+    ]
+
+    operations = [
+    ]
diff --git a/junction/tickets/urls.py b/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'),
-)
+]
diff --git a/junction/urls.py b/junction/urls.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+import junction.proposals.dashboard
+import django.views.defaults
 
 # Third Party Stuff
+from django.conf.urls import include, url
 from django.conf import settings
-from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic.base import RedirectView, TemplateView
@@ -33,8 +35,9 @@
 reference to them here.
 '''
 
-urlpatterns = patterns(
-    '',
+
+urlpatterns = [
+
     url(r'^$', HomePageView.as_view(), name="page-home"),
 
     # Django Admin
@@ -50,18 +53,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 +103,13 @@
         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)
+
 
 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),
+    ]
diff --git a/requirements.txt b/requirements.txt
diff --git a/settings/common.py b/settings/common.py
