mirror of
				https://github.com/graphql-python/graphene-django.git
				synced 2025-11-04 01:47:57 +03:00 
			
		
		
		
	Fix broken UT due to pytest import error (#1368)
This commit is contained in:
		
							parent
							
								
									4517e32224
								
							
						
					
					
						commit
						86c5309c45
					
				| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
from django import forms
 | 
					from django import forms
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import graphene
 | 
					import graphene
 | 
				
			||||||
from graphene import (
 | 
					from graphene import (
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
import pytest
 | 
					import pytest
 | 
				
			||||||
from django import forms
 | 
					from django import forms
 | 
				
			||||||
from django.core.exceptions import ValidationError
 | 
					from django.core.exceptions import ValidationError
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from graphene import Field, ObjectType, Schema, String
 | 
					from graphene import Field, ObjectType, Schema, String
 | 
				
			||||||
from graphene_django import DjangoObjectType
 | 
					from graphene_django import DjangoObjectType
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ import copy
 | 
				
			||||||
import graphene
 | 
					import graphene
 | 
				
			||||||
from django.db import models
 | 
					from django.db import models
 | 
				
			||||||
from graphene import InputObjectType
 | 
					from graphene import InputObjectType
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
from rest_framework import serializers
 | 
					from rest_framework import serializers
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ..serializer_converter import convert_serializer_field
 | 
					from ..serializer_converter import convert_serializer_field
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
import datetime
 | 
					import datetime
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
from rest_framework import serializers
 | 
					from rest_framework import serializers
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from graphene import Field, ResolveInfo
 | 
					from graphene import Field, ResolveInfo
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,8 +8,8 @@ import graphene
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from graphene import Field, ResolveInfo
 | 
					from graphene import Field, ResolveInfo
 | 
				
			||||||
from graphene.types.inputobjecttype import InputObjectType
 | 
					from graphene.types.inputobjecttype import InputObjectType
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
from py.test import mark
 | 
					from pytest import mark
 | 
				
			||||||
from rest_framework import serializers
 | 
					from rest_framework import serializers
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ...types import DjangoObjectType
 | 
					from ...types import DjangoObjectType
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,7 +3,7 @@ from collections import namedtuple
 | 
				
			||||||
import pytest
 | 
					import pytest
 | 
				
			||||||
from django.db import models
 | 
					from django.db import models
 | 
				
			||||||
from django.utils.translation import gettext_lazy as _
 | 
					from django.utils.translation import gettext_lazy as _
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import graphene
 | 
					import graphene
 | 
				
			||||||
from graphene import NonNull
 | 
					from graphene import NonNull
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
from django.core.exceptions import ValidationError
 | 
					from django.core.exceptions import ValidationError
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 | 
					from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@ from django.db import models
 | 
				
			||||||
from django.db.models import Q
 | 
					from django.db.models import Q
 | 
				
			||||||
from django.utils.functional import SimpleLazyObject
 | 
					from django.utils.functional import SimpleLazyObject
 | 
				
			||||||
from graphql_relay import to_global_id
 | 
					from graphql_relay import to_global_id
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import graphene
 | 
					import graphene
 | 
				
			||||||
from graphene.relay import Node
 | 
					from graphene.relay import Node
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
from py.test import raises
 | 
					from pytest import raises
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ..registry import Registry
 | 
					from ..registry import Registry
 | 
				
			||||||
from ..types import DjangoObjectType
 | 
					from ..types import DjangoObjectType
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user