From b085b5922a69f1cadfa2bb72519c19dafebb2e39 Mon Sep 17 00:00:00 2001
From: Misha K <mike.viburn@gmail.com>
Date: Fri, 18 Oct 2019 12:38:59 +0200
Subject: [PATCH] add Django 3.0 to the test matrix (#793)

* add Django 3.0 to the test matrix

* fix six imports
---
 .travis.yml                           | 4 ++++
 graphene_django/debug/sql/tracking.py | 2 +-
 graphene_django/settings.py           | 2 +-
 graphene_django/utils/utils.py        | 2 +-
 tox.ini                               | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 871d4e3..3531b56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
       env: DJANGO=2.1
     - python: 3.6
       env: DJANGO=2.2
+    - python: 3.6
+      env: DJANGO=3.0
     - python: 3.6
       env: DJANGO=master
 
@@ -46,6 +48,8 @@ matrix:
       env: DJANGO=2.1
     - python: 3.7
       env: DJANGO=2.2
+    - python: 3.7
+      env: DJANGO=3.0
     - python: 3.7
       env: DJANGO=master
 
diff --git a/graphene_django/debug/sql/tracking.py b/graphene_django/debug/sql/tracking.py
index f96583b..8391eac 100644
--- a/graphene_django/debug/sql/tracking.py
+++ b/graphene_django/debug/sql/tracking.py
@@ -5,7 +5,7 @@ import json
 from threading import local
 from time import time
 
-from django.utils import six
+import six
 from django.utils.encoding import force_text
 
 from .types import DjangoDebugSQL
diff --git a/graphene_django/settings.py b/graphene_django/settings.py
index af63890..9a5e8a9 100644
--- a/graphene_django/settings.py
+++ b/graphene_django/settings.py
@@ -13,9 +13,9 @@ back to the defaults.
 """
 from __future__ import unicode_literals
 
+import six
 from django.conf import settings
 from django.test.signals import setting_changed
-from django.utils import six
 
 try:
     import importlib  # Available in Python 3.1+
diff --git a/graphene_django/utils/utils.py b/graphene_django/utils/utils.py
index 47c0c37..c1d3572 100644
--- a/graphene_django/utils/utils.py
+++ b/graphene_django/utils/utils.py
@@ -1,8 +1,8 @@
 import inspect
 
+import six
 from django.db import models
 from django.db.models.manager import Manager
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
 
diff --git a/tox.ini b/tox.ini
index a1b599a..e7287ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
     py{27,35,36,37}-django{111,20,21,22,master},
+    py{36,37}-django30,
     black,flake8
 
 [travis:env]
@@ -9,6 +10,7 @@ DJANGO =
     2.0: django20
     2.1: django21
     2.2: django22
+    3.0: django30
     master: djangomaster
 
 [testenv]
@@ -23,6 +25,7 @@ deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
+    django30: Django>=3.0a1,<3.1
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}