Add support for Django 1.8+

Author: njoyce

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
+sudo: false
 
 env:
   global:
@@ -10,21 +11,35 @@ env:
   matrix:
     - USE_EXTENSIONS=true # no dependencies
     - USE_EXTENSIONS=false # no dependencies
-    - DJANGO_VERSION=1.2.7
-    - DJANGO_VERSION=1.3.7
-    - DJANGO_VERSION=1.5.12
-    - DJANGO_VERSION=1.7.3
-    - SQLALCHEMY_VERSION=0.7.10
-    - SQLALCHEMY_VERSION=0.8.7
-    - SQLALCHEMY_VERSION=0.9.8
-    - TWISTED_VERSION=14.0.2
+    # used as part of the pip command
+    - DJANGO_VERSION=">=1.2,<1.3"
+    - DJANGO_VERSION=">=1.3,<1.4"
+    - DJANGO_VERSION=">=1.4,<1.5"
+    - DJANGO_VERSION=">=1.5,<1.6"
+    - DJANGO_VERSION=">=1.6,<1.7"
+    - DJANGO_VERSION=">=1.7,<1.8"
+    - DJANGO_VERSION=">=1.8,<1.9"
+    - DJANGO_VERSION=">=1.9,<2.0"
+    - SQLALCHEMY_VERSION=">=0.7,<0.8"
+    - SQLALCHEMY_VERSION=">=0.8,<0.9"
+    - SQLALCHEMY_VERSION=">=0.9,<1.0"
+    - TWISTED_VERSION=">=14,<15"
+    - TWISTED_VERSION=">=15,<16"
+    # special, see install_optional_dependencies.sh
     - GAESDK_VERSION=1.9.30
 
 matrix:
   exclude:
     # Django 1.7 dropped support for python 2.6
     - python: "2.6"
-      env: DJANGO_VERSION=1.7.3
+      env: DJANGO_VERSION=">=1.7,<1.8"
+    - python: "2.6"
+      env: DJANGO_VERSION=">=1.8,<1.9"
+    - python: "2.6"
+      env: DJANGO_VERSION=">=1.9,<2.0"
+    # Twisted 15+ dropped support for Python 2.6
+    - python: "2.6"
+      env: TWISTED_VERSION=">=15,<16"
     # Google AppEngine SDK dropped support for python 2.6
     - python: "2.6"
       env: GAESDK_VERSION=1.9.30

CHANGES.txt

@@ -6,6 +6,10 @@ versions of PyAMF.
 
 .. contents::
 
+0.8 (Unreleased)
+----------------
+- Add support for Django>=1.8
+
 0.7.2 (2015-02-18)
 ------------------
 - Add support for Cython >= 0.15 (should be backward compatible with future

install_optional_dependencies.sh

@@ -8,23 +8,23 @@ function install_django {
       return 0
   fi
 
-  pip install "Django==${DJANGO_VERSION}"
+  pip install "Django${DJANGO_VERSION}"
 }
 
 function install_sqlalchemy {
   if [ -z "${SQLALCHEMY_VERSION}" ]; then
       return 0
   fi
 
-  pip install "SQLAlchemy==${SQLALCHEMY_VERSION}"
+  pip install "SQLAlchemy${SQLALCHEMY_VERSION}"
 }
 
 function install_twisted {
   if [ -z "${TWISTED_VERSION}" ]; then
       return 0
   fi
 
-  pip install "Twisted==${TWISTED_VERSION}"
+  pip install "Twisted${TWISTED_VERSION}"
 }
 
 function install_gae_sdk {

pyamf/adapters/_django_db_models_base.py

@@ -8,11 +8,24 @@
 @since: 0.4.1
 """
 
+import datetime
+import sys
+
 from django.db.models.base import Model
 from django.db.models import fields
-from django.db.models.fields import related, files
+from django.db.models.fields import files
 
-import datetime
+models = sys.modules['django.db.models']
+
+try:
+    from django.db.models import related
+
+    ForeignObjectRel = related.RelatedObject
+except ImportError:
+    # django 1.8+
+    from django.db.models.fields import related
+
+    ForeignObjectRel = related.ForeignObjectRel
 
 import pyamf
 
@@ -74,12 +87,12 @@ def getCustomProperties(self):
             if isinstance(x, files.FileField):
                 self.readonly_attrs.update([name])
 
-            if isinstance(x, related.RelatedObject):
+            if isinstance(x, ForeignObjectRel):
                 continue
 
-            if isinstance(x, related.ManyToManyField):
+            if isinstance(x, models.ManyToManyField):
                 self.relations[name] = x
-            elif not isinstance(x, related.ForeignKey):
+            elif not isinstance(x, models.ForeignKey):
                 self.fields[name] = x
             else:
                 self.relations[name] = x
@@ -188,7 +201,7 @@ def getEncodableAttributes(self, obj, **kwargs):
             if '_%s_cache' % name in obj.__dict__:
                 attrs[name] = getattr(obj, name)
 
-            if isinstance(relation, related.ManyToManyField):
+            if isinstance(relation, models.ManyToManyField):
                 attrs[name] = [x for x in getattr(obj, name).all()]
             else:
                 attrs.pop(relation.attname, None)
@@ -237,7 +250,7 @@ def getDecodableAttributes(self, obj, attrs, **kwargs):
 
         if not getattr(obj, pk_attr):
             for name, relation in self.relations.iteritems():
-                if isinstance(relation, related.ManyToManyField):
+                if isinstance(relation, models.ManyToManyField):
                     try:
                         if len(attrs[name]) == 0:
                             del attrs[name]

pyamf/adapters/tests/django_app/settings.py

@@ -18,5 +18,9 @@
 }
 
 
-INSTALLED_APPS = ('django_app.adapters',)
+INSTALLED_APPS = (
+    'django_app.adapters',
+    'django.contrib.contenttypes',
+    'django.contrib.auth',
+)
 MIDDLEWARE_CLASSES = ()

pyamf/adapters/tests/test_django.py

@@ -43,6 +43,9 @@
 
 models = None
 
+# required for django <1.6 + python2.6
+__path__ = []
+
 
 def init_django():
     """
@@ -63,6 +66,10 @@ def init_django():
 
     from django_app import settings as app_settings
 
+    app_settings.INSTALLED_APPS = tuple(
+        list(app_settings.INSTALLED_APPS) + [__name__]
+    )
+
     try:
         settings.configure(**app_settings.__dict__)
     except RuntimeError: