Merge pull request #2 from syrusakbary/feature/django

Improved integration with Django

Author: adamcharnock

.travis.yml

@@ -80,13 +80,13 @@ matrix:
   fast_finish: true
   include:
   - python: '2.7'
-    env: DJANGO_VERSION=1.6
+    env: TEST_TYPE=build DJANGO_VERSION=1.6
   - python: '2.7'
-    env: DJANGO_VERSION=1.7
+    env: TEST_TYPE=build DJANGO_VERSION=1.7
   - python: '2.7'
-    env: DJANGO_VERSION=1.8
+    env: TEST_TYPE=build DJANGO_VERSION=1.8
   - python: '2.7'
-    env: DJANGO_VERSION=1.9
+    env: TEST_TYPE=build DJANGO_VERSION=1.9
   - python: '2.7'
     env: TEST_TYPE=build_website
   - python: '2.7'

bin/autolinter

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install the required scripts with
+# pip install autoflake autopep8 isort
 autoflake ./examples/ ./graphene/ -r --remove-unused-variables --remove-all-unused-imports --in-place
 autopep8 ./examples/ ./graphene/ -r --in-place --experimental --aggressive --max-line-length 120
 isort -rc ./examples/ ./graphene/

examples/cookbook/README.md renamed to examples/cookbook_django/README.md

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from cookbook.ingredients.models import Ingredient, Category
+from cookbook.ingredients.models import Category, Ingredient
 
 admin.site.register(Ingredient)
 admin.site.register(Category)

examples/cookbook/cookbook/__init__.py renamed to examples/cookbook_django/cookbook/__init__.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9 on 2015-12-04 18:15
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):