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

Fix broken UT due to pytest import error #1368

Merged
merged 1 commit into from
Nov 14, 2022
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
2 changes: 1 addition & 1 deletion graphene_django/forms/tests/test_converter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django import forms
from py.test import raises
from pytest import raises

import graphene
from graphene import (
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/forms/tests/test_mutation.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
from django import forms
from django.core.exceptions import ValidationError
from py.test import raises
from pytest import raises

from graphene import Field, ObjectType, Schema, String
from graphene_django import DjangoObjectType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import graphene
from django.db import models
from graphene import InputObjectType
from py.test import raises
from pytest import raises
from rest_framework import serializers

from ..serializer_converter import convert_serializer_field
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/rest_framework/tests/test_mutation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import datetime

from py.test import raises
from pytest import raises
from rest_framework import serializers

from graphene import Field, ResolveInfo
Expand Down
4 changes: 2 additions & 2 deletions graphene_django/tests/issues/test_520.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

from graphene import Field, ResolveInfo
from graphene.types.inputobjecttype import InputObjectType
from py.test import raises
from py.test import mark
from pytest import raises
from pytest import mark
from rest_framework import serializers

from ...types import DjangoObjectType
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/tests/test_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest
from django.db import models
from django.utils.translation import gettext_lazy as _
from py.test import raises
from pytest import raises

import graphene
from graphene import NonNull
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/tests/test_forms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.core.exceptions import ValidationError
from py.test import raises
from pytest import raises

from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField

Expand Down
2 changes: 1 addition & 1 deletion graphene_django/tests/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.db.models import Q
from django.utils.functional import SimpleLazyObject
from graphql_relay import to_global_id
from py.test import raises
from pytest import raises

import graphene
from graphene.relay import Node
Expand Down
2 changes: 1 addition & 1 deletion graphene_django/tests/test_schema.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from py.test import raises
from pytest import raises

from ..registry import Registry
from ..types import DjangoObjectType
Expand Down