Merge remote-tracking branch 'origin/bugfix/multiple_model_serializers' into bugfix/multiple_model_serializers

# Conflicts:
#	graphene_django/rest_framework/mutation.py
#	graphene_django/tests/test_converter.py
#	graphene_django/types.py
#	graphene_django/utils/utils.py
#	graphene_django/views.py

Author: Hispar

.circleci/config.yml

@@ -0,0 +1,127 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2.1
+
+jobs:
+  test-3_7-django2_1: &test-template
+    parameters:
+      django_version:
+        type: string
+        default: "2.1"
+    docker:
+      # specify the version you desire here
+      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
+      - image: circleci/python:3.7-rc-node
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "setup.py" }}
+            - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -e .[test]
+            pip install psycopg2
+
+      - run:
+          name: install django version
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install django==<< parameters.django_version >>
+
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-dependencies-{{ checksum "setup.py" }}
+
+      - run:
+          name: Run tests
+          command: |
+            . venv/bin/activate
+            py.test --cov=graphene_django graphene_django examples
+            coveralls
+
+      - store_artifacts:
+          path: test-reports
+          destination: test-reports
+
+  test-3_7-django2_0:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.7-rc-node
+  test-3_6-django2_1:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.6-jessie
+  test-3_6-django2_0:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.6-jessie
+  test-3_5-django2_1:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.5-jessie
+  test-3_5-django2_0:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.5-jessie
+  test-3_5-django1_11:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.5-jessie
+  test-3_4-django2_0:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.4-jessie
+  test-3_4-django1_11:
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.4-jessie
+#  test-2_7-django1_11:
+#    <<: *test-template
+#    docker:
+#      - image: circleci/python:2.7-jessie
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test-3_7-django2_1:
+          django_version: "2.1"
+      - test-3_7-django2_0:
+          django_version: "2.0"
+      - test-3_6-django2_1:
+          django_version: "2.1"
+      - test-3_6-django2_0:
+          django_version: "2.0"
+      - test-3_5-django2_1:
+          django_version: "2.1"
+      - test-3_5-django2_0:
+          django_version: "2.0"
+      - test-3_5-django1_11:
+          django_version: "1.11"
+      - test-3_4-django2_0:
+          django_version: "2.0"
+      - test-3_4-django2_0:
+          django_version: "2.0"
+      - test-3_4-django1_11:
+          django_version: "1.11"
+#      - test-2_7-django1_11:
+#          django_version: "1.11"

.circleci/run-build-locally.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+curl --user ${CIRCLE_TOKEN}: \
+    --request POST \
+    --form revision=<commit hash>\
+    --form [email protected] \
+    --form notify=false \
+        https://circleci.com/api/v1.1/project/<source, eg. github>/<user name>/<project name>/tree/<branch name>

.gitignore

@@ -11,6 +11,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
 build/
 develop-eggs/
 dist/

README.md

@@ -2,7 +2,7 @@ Please read [UPGRADE-v2.0.md](https://github.com/graphql-python/graphene/blob/ma
 
 ---
 
-# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-Django [![Build Status](https://travis-ci.org/graphql-python/graphene-django.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-django) [![PyPI version](https://badge.fury.io/py/graphene-django.svg)](https://badge.fury.io/py/graphene-django) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene-django/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene-django?branch=master)
+# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-Django-MrMilu [![CircleCI](https://circleci.com/gh/mrmilu/graphene-django/tree/master.svg?style=svg)](https://circleci.com/gh/mrmilu/graphene-django/tree/master) [![Coverage Status](https://coveralls.io/repos/mrmilu/graphene-django/badge.svg?branch=master&service=github)](https://coveralls.io/github/mrmilu/graphene-django?branch=master)
 
 
 A [Django](https://www.djangoproject.com/) integration for [Graphene](http://graphene-python.org/).

graphene_django/__init__.py

@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.2.0"
+__version__ = "2.3.1"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

graphene_django/converter.py

@@ -24,6 +24,7 @@
 from .compat import ArrayField, HStoreField, JSONField, RangeField
 from .fields import DjangoListField, DjangoConnectionField
 from .utils import import_single_dispatch
+from .settings import graphene_settings
 
 singledispatch = import_single_dispatch()
 
@@ -58,7 +59,7 @@ def convert_django_field_with_choices(field, registry=None):
         if converted:
             return converted
     choices = getattr(field, "choices", None)
-    if choices:
+    if choices and graphene_settings.GRAPHENE_CONVERT_CHOICES_TO_ENUMS:
         meta = field.model._meta
         name = to_camel_case("{}_{}".format(meta.object_name, field.name))
         choices = list(get_choices(choices))
@@ -211,10 +212,10 @@ def dynamic_type():
 
 @convert_django_field.register(ArrayField)
 def convert_postgres_array_to_list(field, registry=None):
-    base_type = convert_django_field(field.base_field)
-    if not isinstance(base_type, (List, NonNull)):
-        base_type = type(base_type)
-    return List(base_type, description=field.help_text, required=not field.null)
+    inner_type = convert_django_field(field.base_field)
+    if not isinstance(inner_type, (List, NonNull)):
+        inner_type = NonNull(type(inner_type)) if inner_type.kwargs['required'] else type(inner_type)
+    return List(inner_type, description=field.help_text, required=not field.null)
 
 
 @convert_django_field.register(HStoreField)
@@ -227,5 +228,5 @@ def convert_posgres_field_to_string(field, registry=None):
 def convert_posgres_range_to_string(field, registry=None):
     inner_type = convert_django_field(field.base_field)
     if not isinstance(inner_type, (List, NonNull)):
-        inner_type = type(inner_type)
+        inner_type = NonNull(type(inner_type)) if inner_type.kwargs['required'] else type(inner_type)
     return List(inner_type, description=field.help_text, required=not field.null)

graphene_django/filter/fields.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from functools import partial
 
+from graphql.error import GraphQLError
 from graphene.types.argument import to_arguments
 from ..fields import DjangoConnectionField
 from .utils import get_filtering_args_from_filterset, get_filterset_class
@@ -89,11 +90,22 @@ def connection_resolver(
         **args
     ):
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-        qs = filterset_class(
+
+        filterset = filterset_class(
             data=filter_kwargs,
             queryset=default_manager.get_queryset(),
             request=info.context,
-        ).qs
+        )
+
+        if not (filterset.is_bound and filterset.form.is_valid()):
+            exc = {
+                str(key): [str(e.message) for e in error_list]
+                for key, error_list in filterset.form.errors.as_data().items()
+            }
+
+            raise GraphQLError(exc)
+
+        qs = filterset.qs
 
         return super(DjangoFilterConnectionField, cls).connection_resolver(
             resolver,

graphene_django/filter/tests/test_fields.py

@@ -290,6 +290,37 @@ class Query(ObjectType):
     )
 
 
+def test_filter_filterset_validation_errors():
+    class ReporterFilterNode(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+            filter_fields = ("id",)
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterFilterNode)
+
+    r1 = Reporter.objects.create(first_name="r1", last_name="r1", email="[email protected]")
+
+    query = """
+    query {
+        allReporters(id:"foo") {
+            edges {
+                node {
+                    id
+                }
+            }
+        }
+    }
+    """
+    schema = Schema(query=Query)
+    result = schema.execute(query)
+
+    assert result.errors
+    # We should get back an error message
+    assert result.to_dict()['errors'][0]["message"] == "{'id': ['Invalid ID specified.']}"
+
+
 def test_global_id_field_implicit():
     field = DjangoFilterConnectionField(ArticleNode, fields=["id"])
     filterset_class = field.filterset_class

graphene_django/rest_framework/models.py

@@ -4,3 +4,8 @@
 class MyFakeModel(models.Model):
     cool_name = models.CharField(max_length=50)
     created = models.DateTimeField(auto_now_add=True)
+
+
+class MyFakeModelWithPassword(models.Model):
+    cool_name = models.CharField(max_length=50)
+    password = models.CharField(max_length=50)