diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2dbf822..c63742a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 }} diff --git a/graphene_django/tests/urls.py b/graphene_django/tests/urls.py index 66b3fc4..f2faae2 100644 --- a/graphene_django/tests/urls.py +++ b/graphene_django/tests/urls.py @@ -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)), ] diff --git a/graphene_django/tests/urls_inherited.py b/graphene_django/tests/urls_inherited.py index 6fa8019..815d04d 100644 --- a/graphene_django/tests/urls_inherited.py +++ b/graphene_django/tests/urls_inherited.py @@ -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())] diff --git a/graphene_django/tests/urls_pretty.py b/graphene_django/tests/urls_pretty.py index 1133c87..635d4f3 100644 --- a/graphene_django/tests/urls_pretty.py +++ b/graphene_django/tests/urls_pretty.py @@ -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))] diff --git a/tox.ini b/tox.ini index 7128afe..fc89ce9 100644 --- a/tox.ini +++ b/tox.ini @@ -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]