Fix project setup (#1087)

* Fix project setup

* Fix test_should_query_postgres_fields
This commit is contained in:
Lucas 2021-01-02 09:46:00 -08:00 committed by GitHub
parent 8324d47999
commit fdeadf5ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View File

@ -6,13 +6,16 @@ try:
# Postgres fields are only available in Django with psycopg2 installed # Postgres fields are only available in Django with psycopg2 installed
# and we cannot have psycopg2 on PyPy # and we cannot have psycopg2 on PyPy
from django.contrib.postgres.fields import ( from django.contrib.postgres.fields import (
IntegerRangeField,
ArrayField, ArrayField,
HStoreField, HStoreField,
JSONField as PGJSONField, JSONField as PGJSONField,
RangeField, RangeField,
) )
except ImportError: except ImportError:
ArrayField, HStoreField, PGJSONField, RangeField = (MissingType,) * 4 IntegerRangeField, ArrayField, HStoreField, PGJSONField, RangeField = (
MissingType,
) * 5
try: try:
# JSONField is only available from Django 3.1 # JSONField is only available from Django 3.1

View File

@ -11,7 +11,7 @@ from py.test import raises
import graphene import graphene
from graphene.relay import Node from graphene.relay import Node
from ..compat import JSONField, MissingType from ..compat import IntegerRangeField, MissingType
from ..fields import DjangoConnectionField from ..fields import DjangoConnectionField
from ..types import DjangoObjectType from ..types import DjangoObjectType
from ..utils import DJANGO_FILTER_INSTALLED from ..utils import DJANGO_FILTER_INSTALLED
@ -114,7 +114,7 @@ def test_should_query_well():
assert result.data == expected assert result.data == expected
@pytest.mark.skipif(JSONField is MissingType, reason="RangeField should exist") @pytest.mark.skipif(IntegerRangeField is MissingType, reason="RangeField should exist")
def test_should_query_postgres_fields(): def test_should_query_postgres_fields():
from django.contrib.postgres.fields import ( from django.contrib.postgres.fields import (
IntegerRangeField, IntegerRangeField,

View File

@ -45,5 +45,5 @@ use_parentheses=True
line_length=88 line_length=88
[tool:pytest] [tool:pytest]
DJANGO_SETTINGS_MODULE = django_test_settings DJANGO_SETTINGS_MODULE = examples.django_test_settings
addopts = --random-order addopts = --random-order