Update travis and tox (#667)

* Update travis and tox

* Use xenial distribution

* Don't install coveralls twice

* Add black and flake8 tox commands

* Remove Python 3.5 test for Django master

* Fix indent

* Ignore migrations

* Remove black for now

* Run black formatting (#668)

* Run black format

* Update makefile

* Add black to travis build

Author: jkimbo

.travis.yml

@@ -1,58 +1,58 @@
 language: python
-sudo: required
+cache: pip
 dist: xenial
 
-python:
-  - 2.7
-  - 3.4
-  - 3.5
-  - 3.6
-  - 3.7
-
-env:
-  matrix:
-    - DJANGO=1.11
-    - DJANGO=2.1
-    - DJANGO=2.2
-    - DJANGO=master
-
 install:
-  - TOX_ENV=py${TRAVIS_PYTHON_VERSION}-django${DJANGO}
-  - pip install tox
-  - tox -e $TOX_ENV --notest
-script:
-  - tox -e $TOX_ENV
+  - pip install tox tox-travis
 
-after_success:
-  - tox -e $TOX_ENV -- pip install coveralls 
-  - tox -e $TOX_ENV -- coveralls $COVERALLS_OPTION
+script: 
+  - tox
+
+after_success: 
+  - pip install coveralls
+  - coveralls
 
 matrix:
   fast_finish: true
   include:
-  - python: 3.5
-    script: tox -e lint
-  exclude:
     - python: 2.7
+      env: DJANGO=1.11
+
+    - python: 3.5
+      env: DJANGO=1.11
+    - python: 3.5
+      env: DJANGO=2.0
+    - python: 3.5
       env: DJANGO=2.1
-    - python: 2.7
+    - python: 3.5
       env: DJANGO=2.2
-    - python: 2.7
-      env: DJANGO=master
-    - python: 3.4
+
+    - python: 3.6
+      env: DJANGO=1.11
+    - python: 3.6
+      env: DJANGO=2.0
+    - python: 3.6
       env: DJANGO=2.1
-    - python: 3.4
+    - python: 3.6
       env: DJANGO=2.2
-    - python: 3.4
+    - python: 3.6
       env: DJANGO=master
-    - python: 3.5
-      env: DJANGO=master
-    - python: 3.7
-      env: DJANGO=1.10
+
     - python: 3.7
       env: DJANGO=1.11
-  allow_failures:
     - python: 3.7
+      env: DJANGO=2.0
+    - python: 3.7
+      env: DJANGO=2.1
+    - python: 3.7
+      env: DJANGO=2.2
+    - python: 3.7
+      env: DJANGO=master
+
+    - python: 3.7
+      env: TOXENV=black,flake8
+
+  allow_failures:
     - env: DJANGO=master
 
 deploy:

Makefile

@@ -5,7 +5,7 @@ tests:
 	py.test graphene_django --cov=graphene_django -vv
 
 format:
-	black graphene_django
+	black --exclude "/migrations/" graphene_django examples
 
 lint:
-	flake8 graphene_django
+	flake8 graphene_django examples

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

@@ -5,8 +5,8 @@
 
 @admin.register(Ingredient)
 class IngredientAdmin(admin.ModelAdmin):
-    list_display = ('id', 'name', 'category')
-    list_editable = ('name', 'category')
+    list_display = ("id", "name", "category")
+    list_editable = ("name", "category")
 
 
 admin.site.register(Category)

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

@@ -2,6 +2,6 @@
 
 
 class IngredientsConfig(AppConfig):
-    name = 'cookbook.ingredients'
-    label = 'ingredients'
-    verbose_name = 'Ingredients'
+    name = "cookbook.ingredients"
+    label = "ingredients"
+    verbose_name = "Ingredients"

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

@@ -3,7 +3,8 @@
 
 class Category(models.Model):
     class Meta:
-        verbose_name_plural = 'Categories'
+        verbose_name_plural = "Categories"
+
     name = models.CharField(max_length=100)
 
     def __str__(self):
@@ -13,7 +14,9 @@ def __str__(self):
 class Ingredient(models.Model):
     name = models.CharField(max_length=100)
     notes = models.TextField(null=True, blank=True)
-    category = models.ForeignKey(Category, related_name='ingredients', on_delete=models.CASCADE)
+    category = models.ForeignKey(
+        Category, related_name="ingredients", on_delete=models.CASCADE
+    )
 
     def __str__(self):
         return self.name

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

@@ -15,22 +15,20 @@ class Meta:
 
 
 class Query(object):
-    category = graphene.Field(CategoryType,
-                              id=graphene.Int(),
-                              name=graphene.String())
+    category = graphene.Field(CategoryType, id=graphene.Int(), name=graphene.String())
     all_categories = graphene.List(CategoryType)
 
-    ingredient = graphene.Field(IngredientType,
-                                id=graphene.Int(),
-                                name=graphene.String())
+    ingredient = graphene.Field(
+        IngredientType, id=graphene.Int(), name=graphene.String()
+    )
     all_ingredients = graphene.List(IngredientType)
 
     def resolve_all_categories(self, context):
         return Category.objects.all()
 
     def resolve_all_ingredients(self, context):
         # We can easily optimize query count in the resolve method
-        return Ingredient.objects.select_related('category').all()
+        return Ingredient.objects.select_related("category").all()
 
     def resolve_category(self, context, id=None, name=None):
         if id is not None:

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

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

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

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

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

@@ -2,6 +2,6 @@
 
 
 class RecipesConfig(AppConfig):
-    name = 'cookbook.recipes'
-    label = 'recipes'
-    verbose_name = 'Recipes'
+    name = "cookbook.recipes"
+    label = "recipes"
+    verbose_name = "Recipes"

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

@@ -6,17 +6,23 @@
 class Recipe(models.Model):
     title = models.CharField(max_length=100)
     instructions = models.TextField()
+
     def __str__(self):
         return self.title
 
 
 class RecipeIngredient(models.Model):
-    recipe = models.ForeignKey(Recipe, related_name='amounts', on_delete=models.CASCADE)
-    ingredient = models.ForeignKey(Ingredient, related_name='used_by', on_delete=models.CASCADE)
+    recipe = models.ForeignKey(Recipe, related_name="amounts", on_delete=models.CASCADE)
+    ingredient = models.ForeignKey(
+        Ingredient, related_name="used_by", on_delete=models.CASCADE
+    )
     amount = models.FloatField()
-    unit = models.CharField(max_length=20, choices=(
-        ('unit', 'Units'),
-        ('kg', 'Kilograms'),
-        ('l', 'Litres'),
-        ('st', 'Shots'),
-    ))
+    unit = models.CharField(
+        max_length=20,
+        choices=(
+            ("unit", "Units"),
+            ("kg", "Kilograms"),
+            ("l", "Litres"),
+            ("st", "Shots"),
+        ),
+    )