Merge remote-tracking branch 'upstream/master' into drf-serializer-update

Author: pizzapanther

README.md

@@ -67,7 +67,7 @@ class User(DjangoObjectType):
 class Query(graphene.ObjectType):
     users = graphene.List(User)
 
-    def resolve_users(self):
+    def resolve_users(self, info):
         return UserModel.objects.all()
 
 schema = graphene.Schema(query=Query)

docs/tutorial-plain.rst

@@ -153,7 +153,7 @@ Create ``cookbook/ingredients/schema.py`` and type the following:
             model = Ingredient
 
 
-    class Query(graphene.AbstractType):
+    class Query(object):
         all_categories = graphene.List(CategoryType)
         all_ingredients = graphene.List(IngredientType)
 
@@ -426,7 +426,7 @@ We can update our schema to support that, by adding new query for ``ingredient``
           model = Ingredient
 
 
-  class Query(graphene.AbstractType):
+  class Query(object):
       category = graphene.Field(CategoryType,
                                 id=graphene.Int(),
                                 name=graphene.String())

setup.py

@@ -57,7 +57,7 @@
 
     install_requires=[
         'six>=1.10.0',
-        'graphene>=2.0',
+        'graphene>=2.0,<3',
         'Django>=1.8.0',
         'iso8601',
         'singledispatch>=3.4.0.3',