upgrade to django 1.9

accounts/urls.py

@@ -1,38 +1,40 @@
 from django.conf.urls import url, include
 
+from accounts import views
+
 
 urlpatterns = [
     # Profile
-    url(r'^profile/$', 'accounts.views.profile', name='profile'),
+    url(r'^profile/$', views.profile, name='profile'),
     # Users
-    url(r'^admin/users/$', 'accounts.views.user_list', name='list-user'),
-    url(r'^admin/users/add/$', 'accounts.views.user_edit', name='add-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/$', 'accounts.views.user_details', name='show-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/edit/$', 'accounts.views.user_edit', name='edit-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/edit-password/$', 'accounts.views.user_edit_password', name='edit-user-password'),
-    url(r'^admin/users/(?P<user>[0-9]+)/delete/$', 'accounts.views.user_delete', name='delete-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/activate/$', 'accounts.views.user_activate', name='activate-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/disable/$', 'accounts.views.user_disable', name='disable-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/add-group/$', 'accounts.views.user_add_group', name='add-group-to-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/remove-group/(?P<group>[0-9]+)/$', 'accounts.views.user_remove_group', name='remove-group-from-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/add-team/$', 'accounts.views.user_add_team', name='add-team-to-user'),
-    url(r'^admin/users/(?P<user>[0-9]+)/remove-team/(?P<team>[0-9]+)/$', 'accounts.views.user_remove_team', name='remove-team-from-user'),
+    url(r'^admin/users/$', views.user_list, name='list-user'),
+    url(r'^admin/users/add/$', views.user_edit, name='add-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/$', views.user_details, name='show-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/edit/$', views.user_edit, name='edit-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/edit-password/$', views.user_edit_password, name='edit-user-password'),
+    url(r'^admin/users/(?P<user>[0-9]+)/delete/$', views.user_delete, name='delete-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/activate/$', views.user_activate, name='activate-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/disable/$', views.user_disable, name='disable-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/add-group/$', views.user_add_group, name='add-group-to-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/remove-group/(?P<group>[0-9]+)/$', views.user_remove_group, name='remove-group-from-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/add-team/$', views.user_add_team, name='add-team-to-user'),
+    url(r'^admin/users/(?P<user>[0-9]+)/remove-team/(?P<team>[0-9]+)/$', views.user_remove_team, name='remove-team-from-user'),
     # Groups
-    url(r'^admin/groups/$', 'accounts.views.group_list', name='list-group'),
-    url(r'^admin/groups/add/$', 'accounts.views.group_edit', name='add-group'),
-    url(r'^admin/groups/(?P<group>[0-9]+)/$', 'accounts.views.group_details', name='show-group'),
-    url(r'^admin/groups/(?P<group>[0-9]+)/edit/$', 'accounts.views.group_edit', name='edit-group'),
-    url(r'^admin/groups/(?P<group>[0-9]+)/delete/$', 'accounts.views.group_delete', name='delete-group'),
-    url(r'^admin/groups/(?P<group>[0-9]+)/add-user/$', 'accounts.views.group_add_user', name='add-user-to-group'),
-    url(r'^admin/groups/(?P<group>[0-9]+)/remove-user/(?P<user>[0-9]+)/$', 'accounts.views.group_remove_user', name='remove-user-from-group'),
+    url(r'^admin/groups/$', views.group_list, name='list-group'),
+    url(r'^admin/groups/add/$', views.group_edit, name='add-group'),
+    url(r'^admin/groups/(?P<group>[0-9]+)/$', views.group_details, name='show-group'),
+    url(r'^admin/groups/(?P<group>[0-9]+)/edit/$', views.group_edit, name='edit-group'),
+    url(r'^admin/groups/(?P<group>[0-9]+)/delete/$', views.group_delete, name='delete-group'),
+    url(r'^admin/groups/(?P<group>[0-9]+)/add-user/$', views.group_add_user, name='add-user-to-group'),
+    url(r'^admin/groups/(?P<group>[0-9]+)/remove-user/(?P<user>[0-9]+)/$', views.group_remove_user, name='remove-user-from-group'),
     # Teams
-    url(r'^admin/teams/$', 'accounts.views.team_list', name='list-team'),
-    url(r'^admin/teams/add/$', 'accounts.views.team_edit', name='add-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/$', 'accounts.views.team_details', name='show-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/edit$', 'accounts.views.team_edit', name='edit-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/delete$', 'accounts.views.team_delete', name='delete-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/add-user/$', 'accounts.views.team_add_user', name='add-user-to-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/remove-user/(?P<user>[0-9]+)/$', 'accounts.views.team_remove_user', name='remove-user-from-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/add-group/$', 'accounts.views.team_add_group', name='add-group-to-team'),
-    url(r'^admin/teams/(?P<team>[0-9]+)/remove-group/(?P<group>[0-9]+)/$', 'accounts.views.team_remove_group', name='remove-group-from-team'),
+    url(r'^admin/teams/$', views.team_list, name='list-team'),
+    url(r'^admin/teams/add/$', views.team_edit, name='add-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/$', views.team_details, name='show-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/edit$', views.team_edit, name='edit-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/delete$', views.team_delete, name='delete-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/add-user/$', views.team_add_user, name='add-user-to-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/remove-user/(?P<user>[0-9]+)/$', views.team_remove_user, name='remove-user-from-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/add-group/$', views.team_add_group, name='add-group-to-team'),
+    url(r'^admin/teams/(?P<team>[0-9]+)/remove-group/(?P<group>[0-9]+)/$', views.team_remove_group, name='remove-group-from-team'),
 ]

coverage.sh

@@ -7,5 +7,5 @@ if [ "$?" -ne 0 ]; then
   pip install coverage
 fi
 
-coverage run --branch --source=accounts,permissions,tracker --omit=accounts/migrations/*.py,permissions/migrations/*.py,tracker/migrations/*.py manage.py test --settings ponytracker.test_settings
+coverage run --branch --source=accounts,permissions,tracker --omit=accounts/migrations/*.py,permissions/migrations/*.py,tracker/migrations/*.py,tracker/tasks.py manage.py test --settings ponytracker.test_settings
 coverage report

permissions/urls.py

@@ -1,17 +1,19 @@
 from django.conf.urls import url, include
 
+from permissions import views
+
 
 urlpatterns = [
     # Global permissions
-    url(r'^admin/permissions/$', 'permissions.views.global_perm_list', name='list-global-permission'),
-    url(r'^admin/permissions/add/$', 'permissions.views.global_perm_edit', name='add-global-permission'),
-    url(r'^admin/permissions/(?P<id>[0-9]+)/edit/$', 'permissions.views.global_perm_edit', name='edit-global-permission'),
-    url(r'^admin/permissions/(?P<id>[0-9]+)/delete/$', 'permissions.views.global_perm_delete', name='delete-global-permission'),
-    url(r'^admin/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', 'permissions.views.global_perm_toggle', name='toggle-global-permission'),
+    url(r'^admin/permissions/$', views.global_perm_list, name='list-global-permission'),
+    url(r'^admin/permissions/add/$', views.global_perm_edit, name='add-global-permission'),
+    url(r'^admin/permissions/(?P<id>[0-9]+)/edit/$', views.global_perm_edit, name='edit-global-permission'),
+    url(r'^admin/permissions/(?P<id>[0-9]+)/delete/$', views.global_perm_delete, name='delete-global-permission'),
+    url(r'^admin/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', views.global_perm_toggle, name='toggle-global-permission'),
     # Project permissions
-    url(r'^(?P<project>[-\w]+)/permissions/$', 'permissions.views.project_perm_list', name='list-project-permission'),
-    url(r'^(?P<project>[-\w]+)/permissions/add/$', 'permissions.views.project_perm_edit', name='add-project-permission'),
-    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/edit/$', 'permissions.views.project_perm_edit', name='edit-project-permission'),
-    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/delete/$', 'permissions.views.project_perm_delete', name='delete-project-permission'),
-    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', 'permissions.views.project_perm_toggle', name='toggle-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/$', views.project_perm_list, name='list-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/add/$', views.project_perm_edit, name='add-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/edit/$', views.project_perm_edit, name='edit-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/delete/$', views.project_perm_delete, name='delete-project-permission'),
+    url(r'^(?P<project>[-\w]+)/permissions/(?P<id>[0-9]+)/toggle/(?P<perm>[a-z_]+)/$', views.project_perm_toggle, name='toggle-project-permission'),
 ]

ponytracker/settings.py

@@ -86,7 +86,7 @@
             'context_processors': [
                 'django.contrib.messages.context_processors.messages',
                 'django.contrib.auth.context_processors.auth',
-                'django.core.context_processors.request',
+                'django.template.context_processors.request',
                 'tracker.context_processors.projects',
                 'permissions.context_processors.perm',
             ],

ponytracker/templates/base.html

@@ -1,6 +1,5 @@
 {% load staticfiles %}
 {% load bootstrap3 %}
-{% load firstof from future %}
 <!DOCTYPE html>
 <html lang="en">
   <head>

ponytracker/urls.py

@@ -1,16 +1,17 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
+from django.contrib.auth import views
 
-urlpatterns = patterns('',
+urlpatterns = [
     # django admin
     url(r'^django-admin/', include(admin.site.urls)),
     # login / logout
-    url(r'^login$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
-    url(r'^logout$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout'),
+    url(r'^login$', views.login, {'template_name': 'login.html'}, name='login'),
+    url(r'^logout$', views.logout, {'next_page': '/'}, name='logout'),
     # permissions managment
     url(r'^', include('permissions.urls')),
     # account managment
     url(r'^', include('accounts.urls')),
     # tracker
     url(r'^', include('tracker.urls')),
-)
+]

requirements.txt

@@ -1,4 +1,4 @@
-django<1.9
+django<1.10
 django-bower
 django-colorful
 django-bootstrap3

tracker/urls.py

@@ -1,55 +1,57 @@
 from django.conf.urls import url, include
 
+from tracker import views, api
+
 
 urlpatterns = [
-    url(r'^markdown/$', 'tracker.views.markdown_preview', name='markdown'),
+    url(r'^markdown/$', views.markdown_preview, name='markdown'),
     # API
-    url(r'^api/email/recv/$', 'tracker.api.email_recv', name='recv-email'),
+    url(r'^api/email/recv/$', api.email_recv, name='recv-email'),
     # Administration: redirect on first available admin page
-    url(r'^admin/$', 'tracker.views.admin', name='admin'),
+    url(r'^admin/$', views.admin, name='admin'),
     # Settings
-    url(r'^admin/settings/$', 'tracker.views.settings_list', name='settings'),
+    url(r'^admin/settings/$', views.settings_list, name='settings'),
     # Projects
-    url(r'^$', 'tracker.views.project_list', name='list-project'),
-    url(r'^archived/$', 'tracker.views.project_list', {'archived': True}, name='list-archived-project'),
-    url(r'^add/$', 'tracker.views.project_add', name='add-project'),
-    url(r'^(?P<project>[-\w]+)/edit/$', 'tracker.views.project_edit', name='edit-project'),
-    url(r'^(?P<project>[-\w]+)/delete/$', 'tracker.views.project_delete', name='delete-project'),
-    url(r'^(?P<project>[-\w]+)/subscribe/$', 'tracker.views.project_subscribe', name='subscribe-project'),
-    url(r'^(?P<project>[-\w]+)/unsubscribe/$', 'tracker.views.project_unsubscribe', name='unsubscribe-project'),
-    url(r'^(?P<project>[-\w]+)/archive/$', 'tracker.views.project_archive', {'archive': True}, name='archive-project'),
-    url(r'^(?P<project>[-\w]+)/unarchive/$', 'tracker.views.project_archive', {'archive': False}, name='unarchive-project'),
+    url(r'^$', views.project_list, name='list-project'),
+    url(r'^archived/$', views.project_list, {'archived': True}, name='list-archived-project'),
+    url(r'^add/$', views.project_add, name='add-project'),
+    url(r'^(?P<project>[-\w]+)/edit/$', views.project_edit, name='edit-project'),
+    url(r'^(?P<project>[-\w]+)/delete/$', views.project_delete, name='delete-project'),
+    url(r'^(?P<project>[-\w]+)/subscribe/$', views.project_subscribe, name='subscribe-project'),
+    url(r'^(?P<project>[-\w]+)/unsubscribe/$', views.project_unsubscribe, name='unsubscribe-project'),
+    url(r'^(?P<project>[-\w]+)/archive/$', views.project_archive, {'archive': True}, name='archive-project'),
+    url(r'^(?P<project>[-\w]+)/unarchive/$', views.project_archive, {'archive': False}, name='unarchive-project'),
     # Issues
-    url(r'^(?P<project>[-\w]+)/issues/$', 'tracker.views.issue_list', name='list-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/add/$', 'tracker.views.issue_edit', name='add-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/$', 'tracker.views.issue_details', name='show-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/edit/$', 'tracker.views.issue_edit', name='edit-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/delete/$', 'tracker.views.issue_delete', name='delete-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/close/$', 'tracker.views.issue_close', name='close-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/reopen/$', 'tracker.views.issue_reopen', name='reopen-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comment/$', 'tracker.views.issue_comment_edit', name='add-comment'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/edit/$', 'tracker.views.issue_comment_edit', name='edit-comment'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/delete/$', 'tracker.views.issue_comment_delete', name='delete-comment'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/subscribe/$', 'tracker.views.issue_subscribe', name='subscribe-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/unsubscribe/$', 'tracker.views.issue_unsubscribe', name='unsubscribe-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)/$', 'tracker.views.issue_add_label', name='add-label-to-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)/$', 'tracker.views.issue_remove_label', name='remove-label-from-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)/$', 'tracker.views.issue_add_milestone', name='add-milestone-to-issue'),
-    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/remove-milestone/(?P<milestone>[a-z0-9_.-]+)/$', 'tracker.views.issue_remove_milestone', name='remove-milestone-from-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/$', views.issue_list, name='list-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/add/$', views.issue_edit, name='add-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/$', views.issue_details, name='show-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/edit/$', views.issue_edit, name='edit-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/delete/$', views.issue_delete, name='delete-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/close/$', views.issue_close, name='close-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/reopen/$', views.issue_reopen, name='reopen-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comment/$', views.issue_comment_edit, name='add-comment'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/edit/$', views.issue_comment_edit, name='edit-comment'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/delete/$', views.issue_comment_delete, name='delete-comment'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/subscribe/$', views.issue_subscribe, name='subscribe-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/unsubscribe/$', views.issue_unsubscribe, name='unsubscribe-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)/$', views.issue_add_label, name='add-label-to-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)/$', views.issue_remove_label, name='remove-label-from-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)/$', views.issue_add_milestone, name='add-milestone-to-issue'),
+    url(r'^(?P<project>[-\w]+)/issues/(?P<issue>[0-9]+)/remove-milestone/(?P<milestone>[a-z0-9_.-]+)/$', views.issue_remove_milestone, name='remove-milestone-from-issue'),
     # Labels
-    url(r'^(?P<project>[-\w]+)/labels/$', 'tracker.views.label_list', name='list-label'),
-    url(r'^(?P<project>[-\w]+)/labels/add/$', 'tracker.views.label_edit', name='add-label'),
-    url(r'^(?P<project>[-\w]+)/labels/(?P<id>[0-9]+)/edit/$', 'tracker.views.label_edit', name='edit-label'),
-    url(r'^(?P<project>[-\w]+)/labels/(?P<id>[0-9]+)/delete/$', 'tracker.views.label_delete', name='delete-label'),
+    url(r'^(?P<project>[-\w]+)/labels/$', views.label_list, name='list-label'),
+    url(r'^(?P<project>[-\w]+)/labels/add/$', views.label_edit, name='add-label'),
+    url(r'^(?P<project>[-\w]+)/labels/(?P<id>[0-9]+)/edit/$', views.label_edit, name='edit-label'),
+    url(r'^(?P<project>[-\w]+)/labels/(?P<id>[0-9]+)/delete/$', views.label_delete, name='delete-label'),
     # Milestones
-    url(r'^(?P<project>[-\w]+)/milestones/$', 'tracker.views.milestone_list', name='list-milestone'),
-    url(r'^(?P<project>[-\w]+)/milestones/add/$', 'tracker.views.milestone_edit', name='add-milestone'),
-    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/edit/$', 'tracker.views.milestone_edit', name='edit-milestone'),
-    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/close/$', 'tracker.views.milestone_close', name='close-milestone'),
-    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/reopen/$', 'tracker.views.milestone_reopen', name='reopen-milestone'),
-    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/delete/$', 'tracker.views.milestone_delete', name='delete-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/$', views.milestone_list, name='list-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/add/$', views.milestone_edit, name='add-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/edit/$', views.milestone_edit, name='edit-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/close/$', views.milestone_close, name='close-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/reopen/$', views.milestone_reopen, name='reopen-milestone'),
+    url(r'^(?P<project>[-\w]+)/milestones/(?P<name>[a-z0-9_.-]+)/delete/$', views.milestone_delete, name='delete-milestone'),
     # Activities
-    url(r'^(?P<project>[-\w]+)/activity/$', 'tracker.views.activity', name='show-activity'),
+    url(r'^(?P<project>[-\w]+)/activity/$', views.activity, name='show-activity'),
     # Default redirection
-    url(r'^(?P<project>[-\w]+)/$', 'tracker.views.project_redirect'),
+    url(r'^(?P<project>[-\w]+)/$', views.project_redirect),
 ]