Bug fixes

requirements.txt

@@ -9,4 +9,3 @@ Jinja2>=2.7,<3,
 autopep8>=1,<2
 rawes>=5,<6
 pytz>2014.2
-pyeqs>=0.8.1,<1

setup.py

@@ -31,17 +31,16 @@
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     install_requires= [
-        'Django>=1.5,<1.7',
-        'Pygments>=1.6<1.7',
-        'six>=1.6<1.7',
-        'simplejson>=3,<4',
-        'python-dateutil>=2,<3',
-        'requests>=2,<=3',
-        'sqlparse>=0.1,<0.2',
-        'Jinja2>=2.7,<3',
-        'autopep8>=1,<2',
-        'rawes>=5,<6',
-        'pytz>2014.2',
-        'pyeqs>=0.8.1<1'
+        'Django >=1.5<1.7',
+        'Pygments >=1.6<1.7',
+        'six >=1.6<1.7',
+        'simplejson >=3<4',
+        'python-dateutil >=2<3',
+        'requests>=2<=3',
+        'sqlparse>=0.1<0.2',
+        'Jinja2>=2.7<3',
+        'autopep8>=1<2',
+        'rawes>=5<6',
+        'pytz>=2014.2'
     ]
 )

silk/views/summary.py

@@ -26,23 +26,23 @@ def _avg_overall_time(self, filters):
 
     # TODO: Find a more efficient way to do this. Currently has to go to DB num. views + 1 times and is prob quite expensive
     def _longest_query_by_view(self, filters):
-        values_list = models.Request.objects.filter(*filters).values_list("view_name").annotate(max=Max('time_taken')).order_by('-max')[:6]
+        values_list = models.Request.objects.filter(*filters).values_list("view_name").annotate(max=Max('time_taken')).order_by('-max')[:5]
         requests = []
         for view_name, _ in values_list:
             request = models.Request.objects.filter(view_name=view_name, *filters).order_by('-time_taken')[0]
             requests.append(request)
         return requests
 
     def _time_spent_in_db_by_view(self, filters):
-        values_list = models.Request.objects.filter(*filters).values_list('view_name').annotate(t=Sum('queries__time_taken')).order_by('-t')
+        values_list = models.Request.objects.filter(*filters).values_list('view_name').annotate(t=Sum('queries__time_taken')).order_by('-t')[:5]
         requests = []
         for view, _ in values_list:
             r = models.Request.objects.filter(view_name=view, *filters).annotate(t=Sum('queries__time_taken')).order_by('-t')[0]
             requests.append(r)
         return requests
 
     def _num_queries_by_view(self, filters):
-        queryset = models.Request.objects.filter(*filters).values_list('view_name').annotate(t=Count('queries')).order_by('-t')
+        queryset = models.Request.objects.filter(*filters).values_list('view_name').annotate(t=Count('queries')).order_by('-t')[:5]
         views = [r[0] for r in queryset[:6]]
         requests = []
         for view in views: