Merge pull request #454 from ericfrederich/example_diff

Make examples diff better against each other

examples/cookbook-plain/README.md

@@ -3,7 +3,7 @@ Cookbook Example Django Project
 
 This example project demos integration between Graphene and Django.
 The project contains two apps, one named `ingredients` and another
-named `recepies`.
+named `recipes`.
 
 Getting started
 ---------------

examples/cookbook-plain/cookbook/ingredients/tests.py

@@ -0,0 +1,2 @@
+
+# Create your tests here.

examples/cookbook-plain/cookbook/ingredients/views.py

@@ -0,0 +1,2 @@
+
+# Create your views here.

examples/cookbook-plain/cookbook/recipes/models.py

@@ -6,6 +6,7 @@ from cookbook.ingredients.models import Ingredient
 class Recipe(models.Model):
     title = models.CharField(max_length=100)
     instructions = models.TextField()
+    __unicode__ = lambda self: self.title
 
 
 class RecipeIngredient(models.Model):

examples/cookbook-plain/cookbook/recipes/tests.py

@@ -0,0 +1,2 @@
+
+# Create your tests here.

examples/cookbook-plain/cookbook/recipes/views.py

@@ -0,0 +1,2 @@
+
+# Create your views here.

examples/cookbook/cookbook/ingredients/admin.py

@@ -2,9 +2,11 @@ from django.contrib import admin
 
 from cookbook.ingredients.models import Category, Ingredient
 
+
 @admin.register(Ingredient)
 class IngredientAdmin(admin.ModelAdmin):
-  list_display = ("id","name","category")
+    list_display = ('id', 'name', 'category')
-  list_editable = ("name","category")
+    list_editable = ('name', 'category')
-  
+
+
 admin.site.register(Category)

examples/cookbook/cookbook/ingredients/models.py

@@ -10,7 +10,7 @@ class Category(models.Model):
 
 class Ingredient(models.Model):
     name = models.CharField(max_length=100)
-    notes = models.TextField(null=True,blank=True)
+    notes = models.TextField(null=True, blank=True)
     category = models.ForeignKey(Category, related_name='ingredients')
 
     def __str__(self):

examples/cookbook/cookbook/recipes/admin.py

@@ -2,9 +2,11 @@ from django.contrib import admin
 
 from cookbook.recipes.models import Recipe, RecipeIngredient
 
+
 class RecipeIngredientInline(admin.TabularInline):
-  model = RecipeIngredient
+    model = RecipeIngredient
+
 
 @admin.register(Recipe)
 class RecipeAdmin(admin.ModelAdmin):
-  inlines = [RecipeIngredientInline]
+    inlines = [RecipeIngredientInline]

examples/cookbook/cookbook/recipes/models.py

@@ -8,6 +8,7 @@ class Recipe(models.Model):
     instructions = models.TextField()
     __unicode__ = lambda self: self.title
 
+
 class RecipeIngredient(models.Model):
     recipe = models.ForeignKey(Recipe, related_name='amounts')
     ingredient = models.ForeignKey(Ingredient, related_name='used_by')

examples/cookbook/cookbook/schema.py

@@ -5,7 +5,9 @@ import graphene
 from graphene_django.debug import DjangoDebug
 
 
-class Query(cookbook.recipes.schema.Query, cookbook.ingredients.schema.Query, graphene.ObjectType):
+class Query(cookbook.ingredients.schema.Query,
+            cookbook.recipes.schema.Query,
+            graphene.ObjectType):
     debug = graphene.Field(DjangoDebug, name='__debug')
 
 

examples/cookbook/cookbook/settings.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 """
 Django settings for cookbook project.
 

examples/cookbook/cookbook/urls.py

@@ -3,6 +3,7 @@ from django.contrib import admin
 
 from graphene_django.views import GraphQLView
 
+
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^graphql', GraphQLView.as_view(graphiql=True)),

examples/cookbook/setup.cfg

@@ -0,0 +1,2 @@
+[flake8]
+exclude=migrations,.git,__pycache__