[AC-7355] Merge changes from upstream repo

django_tablib/admin/__init__.py

@@ -5,7 +5,14 @@
 import django
 from distutils.version import LooseVersion
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+
+try:
+    # Django <= 1.10
+    from django.core.urlresolvers import reverse
+except ImportError:
+    # Django >= 2.0
+    from django.urls import reverse
+
 from django.http import Http404
 
 

django_tablib/datasets.py

@@ -20,7 +20,13 @@ def __init__(self, queryset, headers=None, encoding='utf-8'):
                 # django < 1.9
                 field_names = v_qs.field_names
             headers.extend(field_names)
-            headers.extend(v_qs.query.aggregate_select)
+
+            if hasattr(v_qs.query, 'aggregate_select'):
+                # Django < 1.10
+                headers.extend(v_qs.query.aggregate_select)
+            elif hasattr(v_qs.query, 'annotation_select'):
+                # Django >= 1.10
+                headers.extend(v_qs.query.annotation_select)
 
             self.header_list = headers
             self.attr_list = headers

testproject/requirements.txt

@@ -1,2 +1,12 @@
-Django==1.6
-tablib==0.9.11
+Django==1.8
+django-tablib==3.2
+et-xmlfile==1.0.1
+jdcal==1.4
+odfpy==1.3.6
+openpyxl==2.5.3
+PyYAML==3.12
+six==1.11.0
+tablib==0.12.1
+unicodecsv==0.14.1
+xlrd==1.1.0
+xlwt==1.3.0