Support Django 4.0

Replace calls to deprecated methods

Fix test config & Replace additional methods removed in django 4.0

Update tox for official Django 4 release
This commit is contained in:
Yair Silbermintz 2021-12-01 12:51:52 -05:00 committed by Tim Schilling
parent e7f7d8da07
commit 82b2d064be
No known key found for this signature in database
GPG Key ID: DDC5DD810DBA776C
5 changed files with 22 additions and 12 deletions

View File

@ -10,7 +10,13 @@ jobs:
matrix:
django: ["2.2", "3.0", "3.1", "3.2"]
python-version: ["3.6", "3.7", "3.8", "3.9"]
include:
- django: "3.2"
python-version: "3.10"
- django: "4.0"
python-version: "3.10"
- django: "main"
python-version: "3.10"
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}

View File

@ -1,8 +1,8 @@
from django.conf.urls import url
from django.urls import re_path
from ..views import GraphQLView
urlpatterns = [
url(r"^graphql/batch", GraphQLView.as_view(batch=True)),
url(r"^graphql", GraphQLView.as_view(graphiql=True)),
re_path(r"^graphql/batch", GraphQLView.as_view(batch=True)),
re_path(r"^graphql", GraphQLView.as_view(graphiql=True)),
]

View File

@ -1,4 +1,4 @@
from django.conf.urls import url
from django.urls import re_path
from ..views import GraphQLView
from .schema_view import schema
@ -10,4 +10,4 @@ class CustomGraphQLView(GraphQLView):
pretty = True
urlpatterns = [url(r"^graphql/inherited/$", CustomGraphQLView.as_view())]
urlpatterns = [re_path(r"^graphql/inherited/$", CustomGraphQLView.as_view())]

View File

@ -1,6 +1,6 @@
from django.conf.urls import url
from django.urls import re_path
from ..views import GraphQLView
from .schema_view import schema
urlpatterns = [url(r"^graphql", GraphQLView.as_view(schema=schema, pretty=True))]
urlpatterns = [re_path(r"^graphql", GraphQLView.as_view(schema=schema, pretty=True))]

12
tox.ini
View File

@ -1,6 +1,8 @@
[tox]
envlist =
py{36,37,38,39}-django{22,30,31,32,main},
py{36,37,38,39}-django{22,30,31},
py{36,37,38,39,310}-django32,
py{38,39,310}-django{40,main},
black,flake8
[gh-actions]
@ -9,6 +11,7 @@ python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
[gh-actions:env]
DJANGO =
@ -16,6 +19,7 @@ DJANGO =
3.0: django30
3.1: django31
3.2: django32
4.0: django40
main: djangomain
[testenv]
@ -26,13 +30,13 @@ setenv =
deps =
-e.[test]
psycopg2-binary
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<3.0
django30: Django>=3.0a1,<3.1
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2a1,<3.3
djangomain: https://github.com/django/django/archive/main.zip
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
commands = {posargs:py.test --cov=graphene_django graphene_django examples}
[testenv:black]