Merge branch 'release/v0.6.3'

PetrDlouhy · Dec 11, 2015 · 2b8b7cb · 2b8b7cb
2 parents 0217464 + cc5c27a
commit 2b8b7cb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.6.3 (2015-12-11)
+-------------------
+
+* support for django 1.9 - depreciated get_model
+
 
 0.6.2 (2015-12-10)
 -------------------

diff --git a/admin_tools_stats/__init__.py b/admin_tools_stats/__init__.py
@@ -13,7 +13,7 @@
 #
 
 
-__version__ = '0.6.2'  # edit also docs/source/conf.py and update requirements.txt
+__version__ = '0.6.3'  # edit also docs/source/conf.py and update requirements.txt
 __author__ = "Arezqui Belaid"
 __contact__ = "areski@gmail.com"
 __homepage__ = "http://www.areskibelaid.com"

diff --git a/admin_tools_stats/modules.py b/admin_tools_stats/modules.py
@@ -12,7 +12,13 @@
 from django.db.models.aggregates import Sum, Avg, Max, Min, StdDev, Variance
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
-from django.db.models import get_model
+try:
+    # django >= 1.7
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    # django < 1.7
+    from django.db.models import get_model
 from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
 from qsstats import QuerySetStats

diff --git a/...tats/migrations/0001_initial_migration.py → ...outh_migrations/0001_initial_migration.py b/...tats/migrations/0001_initial_migration.py → ...outh_migrations/0001_initial_migration.py
diff --git a/...ats/migrations/0002_add_sum_field_name.py → ...uth_migrations/0002_add_sum_field_name.py b/...ats/migrations/0002_add_sum_field_name.py → ...uth_migrations/0002_add_sum_field_name.py
diff --git a/...grations/0003_add_operation_field_name.py → ...grations/0003_add_operation_field_name.py b/...grations/0003_add_operation_field_name.py → ...grations/0003_add_operation_field_name.py
diff --git a/admin_tools_stats/migrations/__init__.py → ..._tools_stats/south_migrations/__init__.py b/admin_tools_stats/migrations/__init__.py → ..._tools_stats/south_migrations/__init__.py
diff --git a/demoproject/demoproject/settings.py b/demoproject/demoproject/settings.py
@@ -99,6 +99,7 @@
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
     'django.template.loaders.eggs.Loader',
+    'admin_tools.template_loaders.Loader',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -132,7 +133,7 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(APPLICATION_DIR, 'templates')
+    os.path.join(APPLICATION_DIR, 'templates'),
 )
 
 INSTALLED_APPS = (
@@ -152,7 +153,7 @@
     'djangobower',
     'demoproject',
     'admin_tools_stats',
-    'south',
+    # 'south',
 )
 
 # Django extensions

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -53,7 +53,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.2'
+version = '0.6.3'
 # The full version, including alpha/beta/rc tags.
 release = version