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

Django v4, python 3.10 support for graphene-django v3 #1281

Merged
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
8 changes: 7 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ from graphene_django.views import GraphQLView

urlpatterns = [
# ...
path('graphql', GraphQLView.as_view(graphiql=True)),
path('graphql/', GraphQLView.as_view(graphiql=True)),
]
```

Expand Down
2 changes: 1 addition & 1 deletion docs/authorization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ For Django 2.2 and above:

urlpatterns = [
# some other urls
path('graphql', PrivateGraphQLView.as_view(graphiql=True, schema=schema)),
path('graphql/', PrivateGraphQLView.as_view(graphiql=True, schema=schema)),
]

.. _LoginRequiredMixin: https://docs.djangoproject.com/en/dev/topics/auth/default/#the-loginrequired-mixin
2 changes: 1 addition & 1 deletion graphene_django/debug/exception/formating.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def wrap_exception(exception):
exc_type=force_str(type(exception)),
stack="".join(
traceback.format_exception(
etype=type(exception), value=exception, tb=exception.__traceback__
exception, value=exception, tb=exception.__traceback__
)
),
)
2 changes: 1 addition & 1 deletion graphene_django/management/commands/graphql_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def add_arguments(self, parser):
class Command(CommandArguments):
help = "Dump Graphene schema as a JSON or GraphQL file"
can_import_settings = True
requires_system_checks = False
requires_system_checks = []

def save_json_file(self, out, schema_dict, indent):
with open(out, "w") as outfile:
Expand Down
6 changes: 3 additions & 3 deletions graphene_django/tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.conf.urls import url
from django.urls import path

from ..views import GraphQLView

urlpatterns = [
url(r"^graphql/batch", GraphQLView.as_view(batch=True)),
url(r"^graphql", GraphQLView.as_view(graphiql=True)),
path("graphql/batch", GraphQLView.as_view(batch=True)),
path("graphql", GraphQLView.as_view(graphiql=True)),
]
4 changes: 2 additions & 2 deletions graphene_django/tests/urls_inherited.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import url
from django.urls import path

from ..views import GraphQLView
from .schema_view import schema
Expand All @@ -10,4 +10,4 @@ class CustomGraphQLView(GraphQLView):
pretty = True


urlpatterns = [url(r"^graphql/inherited/$", CustomGraphQLView.as_view())]
urlpatterns = [path("graphql/inherited/", CustomGraphQLView.as_view())]
4 changes: 2 additions & 2 deletions graphene_django/tests/urls_pretty.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.conf.urls import url
from django.urls import path

from ..views import GraphQLView
from .schema_view import schema

urlpatterns = [url(r"^graphql", GraphQLView.as_view(schema=schema, pretty=True))]
urlpatterns = [path("graphql", GraphQLView.as_view(schema=schema, pretty=True))]
2 changes: 1 addition & 1 deletion graphene_django/utils/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from django.test import Client, TestCase, TransactionTestCase

DEFAULT_GRAPHQL_URL = "/graphql/"
DEFAULT_GRAPHQL_URL = "/graphql"


def graphql_query(
Expand Down
13 changes: 8 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -9,13 +11,15 @@ python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310

[gh-actions:env]
DJANGO =
2.2: django22
3.0: django30
3.1: django31
3.2: django32
4.0: django40
main: djangomain

[testenv]
Expand All @@ -26,12 +30,11 @@ 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
django32: Django>=3.2,<4.0
tim-schilling marked this conversation as resolved.
Show resolved Hide resolved
django40: Django>=4.0,<4.1
djangomain: https://github.com/django/django/archive/main.zip
commands = {posargs:py.test --cov=graphene_django graphene_django examples}

Expand Down