Merge "Revert "django: upgrade to 1.11""

3 files changed, 30 insertions, 25 deletions

diff --git a/linaro_metrics/urls.py b/linaro_metrics/urls.py
index ca864e2..5479a58 100644
--- a/linaro_metrics/urls.py
+++ b/linaro_metrics/urls.py
@@ -1,32 +1,37 @@
-from django.conf.urls import url, include
+from django.conf.urls import patterns, url, include
 from django.contrib import admin
+
 import patchwork.urls
-import linaro_metrics.views
 
 from linaro_metrics.api import TeamList, TeamDetail, TeamPatchList, TeamTagView
 
 admin.autodiscover()
 
-urlpatterns = [
+urlpatterns = patterns(
+    '',
     # Provide our override views of things in patchwork
-    url(r'^$', linaro_metrics.views.index_view),
-    url(r'^project/(?P<project_id>[^/]+)/list/$',
-        linaro_metrics.views.project_view),
-    url(r'^register/', linaro_metrics.views.user_register),
+    (r'^$', 'linaro_metrics.views.index_view'),
+    (r'^project/(?P<project_id>[^/]+)/list/$',
+        'linaro_metrics.views.project_view'),
+    url(r'^register/', 'linaro_metrics.views.user_register'),
 
     # Include all the standard patchwork urls.
     url(r'^', include(patchwork.urls)),
 
     # Now provide our own urls.
-    url(r'^faq$', linaro_metrics.views.faq_view),
-    url(r'^team/$', linaro_metrics.views.team_overview),
-    url(r'^projects/$', linaro_metrics.views.project_overview),
-    url(r'^team/(?P<team>[^/]+)/$', linaro_metrics.views.team_view),
-    url(r'^patches/(?P<user>[^/]+)/$', linaro_metrics.views.user_view),
-    url(r'^reports/project_activity$',
-        linaro_metrics.views.report_project_activity),
-    url(r'^reports/non-author-sign-offs$',
-        linaro_metrics.views.report_signed_off_non_author),
+    (r'^faq$', 'linaro_metrics.views.faq_view'),
+    (r'^team/$', 'linaro_metrics.views.team_overview'),
+    (r'^projects/$', 'linaro_metrics.views.project_overview'),
+    (r'^team/Landing Team - HiSilicon.*', 'linaro_metrics.views.team_view',
+     {'team': 'Landing Team - HiSilicon/Huawei'}),
+    (r'^team/AI/ML/', 'linaro_metrics.views.team_view',
+     {'team': 'AI/ML'}),
+    (r'^team/(?P<team>[^/]+)/$', 'linaro_metrics.views.team_view'),
+    (r'^patches/(?P<user>[^/]+)/$', 'linaro_metrics.views.user_view'),
+    (r'^reports/project_activity$',
+     'linaro_metrics.views.report_project_activity'),
+    (r'^reports/non-author-sign-offs$',
+     'linaro_metrics.views.report_signed_off_non_author'),
 
     url(r'^api/1.0/teams/$', TeamList.as_view(), name='api-team-list'),
     url(r'^api/1.0/teams/(?P<pk>[^/]+)/$', TeamDetail.as_view(),
@@ -37,5 +42,5 @@ urlpatterns = [
         TeamTagView.as_view(), name='api-team-credits'),
 
     # compatibility for old patches
-    url(r'^(?P<patch>\d+)/$', linaro_metrics.views.old_patch_link),
-]
+    (r'^(?P<patch>\d+)/$', 'linaro_metrics.views.old_patch_link'),
+)
diff --git a/linaro_metrics/views.py b/linaro_metrics/views.py
index 329e11b..8a0b1b2 100644
--- a/linaro_metrics/views.py
+++ b/linaro_metrics/views.py
@@ -6,7 +6,7 @@ import mock
 import django.template.base
 
 from django.conf import settings
-from django.contrib.auth.models import User, AnonymousUser
+from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.http import StreamingHttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
@@ -122,11 +122,12 @@ def _non_project_ctx(request, view, view_args, patches):
     project.is_editable.return_value = False
     project.tags = []
 
-    orig = request.user
-    request.user = AnonymousUser()
+    orig = request.user.is_authenticated
+    request.user.is_authenticated = mock.Mock()
+    request.user.is_authenticated.return_value = False
     context = generic_list(
         request, project, view, view_args=view_args, patches=patches)
-    request.user = orig
+    request.user.is_authenticated = orig
 
     # The DelegateFilter won't work for because its tied to a project/user.
     context['filters']._filters = [
diff --git a/requirements.txt b/requirements.txt
index 6c97570..84c8d31 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,8 @@
-Django==1.11
+Django==1.8.10
 djangorestframework==3.5
-django-filter==1.1
+django-filter==1.0
 sqlparse==0.2.2
 dulwich==0.19.6
 mock
 flake8
 python-ldap
-django-auth-ldap