Merge pull request #22 from lucaswiman/django-1.8-support

Django 1.8+ support
chop-dbhi · Dec 22, 2015 · ba282f5 · ba282f5
2 parents b6454a0 + 96b062e
commit ba282f5
Show file tree

Hide file tree

Showing 18 changed files with 210 additions and 376 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,13 @@
 language: python
 
 python:
-    - 2.6
     - 2.7
 
 sudo: false
 
 env:
-    - DJANGO=1.4.16
-    - DJANGO=1.5.11
-    - DJANGO=1.6.8
-    - DJANGO=1.7.1
-
-matrix:
-    exclude:
-        - python: 2.6
-          env: DJANGO=1.7.1
+    - DJANGO=1.8.7
+    - DJANGO=1.9
 
 before_install:
     - bash bin/check_signoff.sh

diff --git a/modeltree/__init__.py b/modeltree/__init__.py
@@ -1,8 +1,8 @@
 __version_info__ = {
-    'major': 1,
-    'minor': 2,
+    'major': 2,
+    'minor': 0,
     'micro': 0,
-    'releaselevel': 'beta',
+    'releaselevel': 'alpha',
     'serial': 1
 }
 

diff --git a/modeltree/compat.py b/modeltree/compat.py
diff --git a/modeltree/managers.py b/modeltree/managers.py
@@ -1,4 +1,3 @@
-import django
 from django.db import models
 from modeltree.query import ModelTreeQuerySet
 
@@ -8,11 +7,8 @@ def __init__(self, tree=None, *args, **kwargs):
         super(ModelTreeManager, self).__init__(*args, **kwargs)
         self.tree = tree or self.model
 
-    def get_query_set(self):
+    def get_queryset(self):
         return ModelTreeQuerySet(model=self.tree, using=self.db)
 
     def select(self, *args, **kwargs):
-        if django.VERSION < (1, 6):
-            return self.get_query_set().select(*args, **kwargs)
-
         return self.get_queryset().select(*args, **kwargs)