Merge branch 'master' of github.com:2degrees/djeneralize

2degrees · Nov 4, 2015 · b2b2844 · b2b2844
2 parents 1065485 + 8d2060c
commit b2b2844
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3rc3
+1.3rc4
diff --git a/djeneralize/query.py b/djeneralize/query.py
@@ -103,7 +103,7 @@ def iterator(self):
             # doesn't make sense to copy any of the "where", "tables" or
             # "order_by" options as these have already been applied in the
             # parent queryset
-            sub_queryset.query.extra = self.query.extra
+            sub_queryset.query._extra = self.query._extra
 
             sub_instances = sub_queryset.in_bulk(ids)
 
@@ -195,4 +195,4 @@ def _clone(self, klass=None, setup=False, **kwargs):
         clone = super(SpecializedQuerySet, self)._clone(klass, setup, **kwargs)
         clone._final_specialization = self._final_specialization
 
-        return clone
+        return clone
diff --git a/setup.py b/setup.py
@@ -48,7 +48,7 @@
       py_modules=[],
       zip_safe=False,
       install_requires=[
-        "Django >= 1.6, <1.7",
+        "Django >= 1.6, <1.8",
         ],
       extras_require={
         'nose': ["nose >= 0.11"],

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -12,4 +12,4 @@
 # NOT LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
 # INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-##############################################################################
+##############################################################################
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,5 +1,5 @@
-Django==1.6.10
+Django==1.7.10
 coverage==3.7.1
-fixture==1.5.1
+fixture==1.5.2
 nose==1.3.4
 psycopg2==2.6