Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Django 3.0 to the test matrix #793

Merged
merged 2 commits into from
Oct 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion graphene_django/debug/sql/tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"""
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+
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/utils/utils.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -9,6 +10,7 @@ DJANGO =
2.0: django20
2.1: django21
2.2: django22
3.0: django30
master: djangomaster

[testenv]
Expand All @@ -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}

Expand Down