Merge branch 'master' into master

Author: aaxelb

.travis.yml

@@ -49,10 +49,6 @@ env:
 matrix:
   fast_finish: true
   include:
-  - python: '2.7'
-    env: TEST_TYPE=build DJANGO_VERSION=1.6
-  - python: '2.7'
-    env: TEST_TYPE=build DJANGO_VERSION=1.7
   - python: '2.7'
     env: TEST_TYPE=build DJANGO_VERSION=1.8
   - python: '2.7'
@@ -68,3 +64,4 @@ deploy:
     tags: true
   password:
     secure: kymIFCEPUbkgRqe2NAXkWfxMmGRfWvWBOP6LIXdVdkOOkm91fU7bndPGrAjos+/7gN0Org609ZmHSlVXNMJUWcsL2or/x5LcADJ4cZDe+79qynuoRb9xs1Ri4O4SBAuVMZxuVJvs8oUzT2R11ql5vASSMtXgbX+ZDGpmPRVZStkCuXgOc4LBhbPKyl3OFy7UQFPgAEmy3Yjh4ZSKzlXheK+S6mmr60+DCIjpaA0BWPxYK9FUE0qm7JJbHLUbwsUP/QMp5MmGjwFisXCNsIe686B7QKRaiOw62eJc2R7He8AuEC8T9OM4kRwDlecSn8mMpkoSB7QWtlJ+6XdLrJFPNvtrOfgfzS9/96Qrw9WlOslk68hMlhJeRb0s2YUD8tiV3UUkvbL1mfFoS4SI9U+rojS55KhUEJWHg1w7DjoOPoZmaIL2ChRupmvrFYNAGae1cxwG3Urh+t3wYlN3gpKsRDe5GOT7Wm2tr0ad3McCpDGUwSChX59BAJXe/MoLxkKScTrMyR8yMxHOF0b4zpVn5l7xB/o2Ik4zavx5q/0rGBMK2D+5d+gpQogKShoquTPsZUwO7sB5hYeH2hqGqpeGzZtb76E2zZYd18pJ0FsBudm5+KWjYdZ+vbtGrLxdTXJ1EEtzVXm0lscykTpqUucbXSa51dhStJvW2xEEz6p3rHo=
+  distributions: "sdist bdist_wheel"

docs/index.rst

@@ -11,4 +11,5 @@ Contents:
    filtering
    authorization
    debug
+   rest-framework
    introspection

docs/rest-framework.rst

@@ -0,0 +1,21 @@
+Integration with Django Rest Framework
+======================================
+
+You can re-use your Django Rest Framework serializer with
+graphene django.
+
+
+Mutation
+--------
+
+You can create a Mutation based on a serializer by using the
+`SerializerMutation` base class:
+
+.. code:: python
+
+    from graphene_django.rest_framework.mutation import SerializerMutation
+
+    class MyAwesomeMutation(SerializerMutation):
+        class Meta:
+            serializer_class = MySerializer
+

docs/tutorial-plain.rst

@@ -73,12 +73,23 @@ Let's get started with these models:
         def __str__(self):
             return self.name
 
+Add ingredients as INSTALLED_APPS:
+
+.. code:: python
+
+    INSTALLED_APPS = [
+        ...
+        # Install the ingredients app
+        'ingredients',
+    ]
+
 Don't forget to create & run migrations:
 
 .. code:: bash
 
     python manage.py makemigrations
     python manage.py migrate
+    
 
 Load some test data
 ^^^^^^^^^^^^^^^^^^^
@@ -95,7 +106,7 @@ following:
     $ python ./manage.py loaddata ingredients
 
     Installed 6 object(s) from 1 fixture(s)
-
+    
 Alternatively you can use the Django admin interface to create some data
 yourself. You'll need to run the development server (see below), and
 create a login for yourself too (``./manage.py createsuperuser``).
@@ -190,17 +201,14 @@ a web-based integrated development environment to assist in the writing
 and executing of GraphQL queries. It will provide us with a simple and
 easy way of testing our cookbook project.
 
-Add ``ingredients`` and ``graphene_django`` to ``INSTALLED_APPS`` in ``cookbook/settings.py``:
+Add ``graphene_django`` to ``INSTALLED_APPS`` in ``cookbook/settings.py``:
 
 .. code:: python
 
     INSTALLED_APPS = [
         ...
         # This will also make the `graphql_schema` management command available
         'graphene_django',
-
-        # Install the ingredients app
-        'ingredients',
     ]
 
 And then add the ``SCHEMA`` to the ``GRAPHENE`` config in ``cookbook/settings.py``:

graphene_django/compat.py

@@ -1,27 +1,10 @@
-from django.db import models
-
-
 class MissingType(object):
     pass
 
 
 try:
-    DurationField = models.DurationField
-    UUIDField = models.UUIDField
-except AttributeError:
-    # Improved compatibility for Django 1.6
-    DurationField = MissingType
-    UUIDField = MissingType
-
-try:
-    from django.db.models.related import RelatedObject
-except:
-    # Improved compatibility for Django 1.6
-    RelatedObject = MissingType
-
-
-try:
-    # Postgres fields are only available in Django 1.8+
+    # Postgres fields are only available in Django with psycopg2 installed
+    # and we cannot have psycopg2 on PyPy
     from django.contrib.postgres.fields import ArrayField, HStoreField, RangeField
 except ImportError:
     ArrayField, HStoreField, JSONField, RangeField = (MissingType, ) * 4

graphene_django/converter.py

@@ -9,8 +9,7 @@
 from graphene.utils.str_converters import to_camel_case, to_const
 from graphql import assert_valid_name
 
-from .compat import (ArrayField, HStoreField, JSONField, RangeField,
-                     RelatedObject, UUIDField, DurationField)
+from .compat import ArrayField, HStoreField, JSONField, RangeField
 from .fields import get_connection_field, DjangoListField
 from .utils import get_related_model, import_single_dispatch
 
@@ -88,7 +87,7 @@ def convert_field_to_string(field, registry=None):
 
 
 @convert_django_field.register(models.AutoField)
-@convert_django_field.register(UUIDField)
+@convert_django_field.register(models.UUIDField)
 def convert_field_to_id(field, registry=None):
     return ID(description=field.help_text, required=not field.null)
 
@@ -114,7 +113,7 @@ def convert_field_to_nullboolean(field, registry=None):
 
 @convert_django_field.register(models.DecimalField)
 @convert_django_field.register(models.FloatField)
-@convert_django_field.register(DurationField)
+@convert_django_field.register(models.DurationField)
 def convert_field_to_float(field, registry=None):
     return Float(description=field.help_text, required=not field.null)
 
@@ -165,26 +164,6 @@ def dynamic_type():
     return Dynamic(dynamic_type)
 
 
-# For Django 1.6
-@convert_django_field.register(RelatedObject)
-def convert_relatedfield_to_djangomodel(field, registry=None):
-    model = field.model
-
-    def dynamic_type():
-        _type = registry.get_type_for_model(model)
-        if not _type:
-            return
-
-        if isinstance(field.field, models.OneToOneField):
-            return Field(_type)
-
-        if is_node(_type):
-            return get_connection_field(_type)
-        return DjangoListField(_type)
-
-    return Dynamic(dynamic_type)
-
-
 @convert_django_field.register(models.OneToOneField)
 @convert_django_field.register(models.ForeignKey)
 def convert_field_to_djangomodel(field, registry=None):

graphene_django/debug/tests/test_query.py

@@ -3,7 +3,6 @@
 import graphene
 from graphene.relay import Node
 from graphene_django import DjangoConnectionField, DjangoObjectType
-from graphene_django.utils import DJANGO_FILTER_INSTALLED
 
 from ...tests.models import Reporter
 from ..middleware import DjangoDebugMiddleware
@@ -167,8 +166,6 @@ def resolve_all_reporters(self, *args, **kwargs):
     assert result.data['__debug']['sql'][1]['rawSql'] == query
 
 
-@pytest.mark.skipif(not DJANGO_FILTER_INSTALLED,
-                    reason="requires django-filter")
 def test_should_query_connectionfilter():
     from ...filter import DjangoFilterConnectionField
 

graphene_django/fields.py

@@ -2,6 +2,8 @@
 
 from django.db.models.query import QuerySet
 
+from promise import Promise
+
 from graphene.types import Field, List
 from graphene.relay import ConnectionField, PageInfo
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
@@ -57,7 +59,33 @@ def get_manager(self):
 
     @classmethod
     def merge_querysets(cls, default_queryset, queryset):
-        return default_queryset & queryset
+        return queryset & default_queryset
+
+    @classmethod
+    def resolve_connection(cls, connection, default_manager, args, iterable):
+        if iterable is None:
+            iterable = default_manager
+        iterable = maybe_queryset(iterable)
+        if isinstance(iterable, QuerySet):
+            if iterable is not default_manager:
+                default_queryset = maybe_queryset(default_manager)
+                iterable = cls.merge_querysets(default_queryset, iterable)
+            _len = iterable.count()
+        else:
+            _len = len(iterable)
+        connection = connection_from_list_slice(
+            iterable,
+            args,
+            slice_start=0,
+            list_length=_len,
+            list_slice_length=_len,
+            connection_type=connection,
+            edge_type=connection.Edge,
+            pageinfo_type=PageInfo,
+        )
+        connection.iterable = iterable
+        connection.length = _len
+        return connection
 
     @classmethod
     def connection_resolver(cls, resolver, connection, default_manager, max_limit,
@@ -84,29 +112,12 @@ def connection_resolver(cls, resolver, connection, default_manager, max_limit,
                 args['last'] = min(last, max_limit)
 
         iterable = resolver(root, args, context, info)
-        if iterable is None:
-            iterable = default_manager
-        iterable = maybe_queryset(iterable)
-        if isinstance(iterable, QuerySet):
-            if iterable is not default_manager:
-                default_queryset = maybe_queryset(default_manager)
-                iterable = cls.merge_querysets(default_queryset, iterable)
-            _len = iterable.count()
-        else:
-            _len = len(iterable)
-        connection = connection_from_list_slice(
-            iterable,
-            args,
-            slice_start=0,
-            list_length=_len,
-            list_slice_length=_len,
-            connection_type=connection,
-            edge_type=connection.Edge,
-            pageinfo_type=PageInfo,
-        )
-        connection.iterable = iterable
-        connection.length = _len
-        return connection
+        on_resolve = partial(cls.resolve_connection, connection, default_manager, args)
+
+        if Promise.is_thenable(iterable):
+            return Promise.resolve(iterable).then(on_resolve)
+
+        return on_resolve(iterable)
 
     def get_resolver(self, parent_resolver):
         return partial(