Merge lp:~ricardokirkner/python-timeline-django/support-django-1.9-plus into lp:python-timeline-django

[Ricardo Kirkner]

added support for django 1.9+

[Fabián Ezequiel Gallina (fgallina)]

LGTM

review: Approve

=== modified file 'setup.py'
--- setup.py	2015-10-02 15:12:12 +0000
+++ setup.py	2017-04-07 14:17:31 +0000
@@ -20,7 +20,7 @@
 
 setup(
     name='timeline_django',
-    version='0.0.5-dev', # Also edit timeline_django/__init__.py when changing.
+    version='0.0.5', # Also edit timeline_django/__init__.py when changing.
     packages=find_packages(),
     include_package_data=True,
     maintainer='Launchpad developers',

=== modified file 'timeline_django/__init__.py'
--- timeline_django/__init__.py	2015-10-02 15:12:12 +0000
+++ timeline_django/__init__.py	2017-04-07 14:17:31 +0000
@@ -20,4 +20,4 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-__version__ = (0, 0, 5, 'dev', 0)
+__version__ = (0, 0, 5, 'final', 0)

=== modified file 'timeline_django/timeline_cursor.py'
--- timeline_django/timeline_cursor.py	2014-03-17 14:19:05 +0000
+++ timeline_django/timeline_cursor.py	2017-04-07 14:17:31 +0000
@@ -14,7 +14,12 @@
 # GNU Lesser General Public License version 3 (see the file LICENSE).
 
 from django import db
-from django.db.backends.util import CursorWrapper
+try:
+    # django >= 1.9
+    from django.db.backends.utils import CursorWrapper
+except ImportError:
+    # django < 1.9
+    from django.db.backends.util import CursorWrapper
 
 
 class TimelineCursor(CursorWrapper):

=== added file 'tox.ini'
--- tox.ini	1970-01-01 00:00:00 +0000
+++ tox.ini	2017-04-07 14:17:31 +0000
@@ -0,0 +1,36 @@
+[tox]
+envlist =
+    py27-django1.6,py27-django1.7,py27-django1.8,py27-django1.9,py27-django1.10,py27-django1.11
+
+[testenv]
+commands = python setup.py test
+
+[testenv:py27]
+basepython = python2.7
+
+[testenv:py3]
+basepython = python3
+
+[testenv:py27-django1.6]
+deps =
+    django >= 1.6, < 1.7
+
+[testenv:py27-django1.7]
+deps =
+    django >= 1.7, < 1.8
+
+[testenv:py27-django1.8]
+deps =
+    django >= 1.8, < 1.9
+
+[testenv:py27-django1.9]
+deps =
+    django >= 1.9, < 1.10
+
+[testenv:py27-django1.10]
+deps =
+    django >= 1.10, < 1.11
+
+[testenv:py27-django1.11]
+deps =
+    django >= 1.11, < 1.12