Merge 696b590 into cf9f590

Author: ulgens

.travis.yml

@@ -5,10 +5,10 @@ dist: xenial
 install:
   - pip install tox tox-travis
 
-script: 
+script:
   - tox
 
-after_success: 
+after_success:
   - pip install coveralls
   - coveralls
 
@@ -24,24 +24,8 @@ jobs:
     - env: DJANGO=master
 
   include:
-    - python: 2.7
-      env: DJANGO=1.11
-
-    - python: 3.5
-      env: DJANGO=1.11
-    - python: 3.5
-      env: DJANGO=2.0
-    - python: 3.5
-      env: DJANGO=2.1
-    - python: 3.5
-      env: DJANGO=2.2
-
     - python: 3.6
       env: DJANGO=1.11
-    - python: 3.6
-      env: DJANGO=2.0
-    - python: 3.6
-      env: DJANGO=2.1
     - python: 3.6
       env: DJANGO=2.2
     - python: 3.6
@@ -51,23 +35,28 @@ jobs:
 
     - python: 3.7
       env: DJANGO=1.11
-    - python: 3.7
-      env: DJANGO=2.0
-    - python: 3.7
-      env: DJANGO=2.1
     - python: 3.7
       env: DJANGO=2.2
     - python: 3.7
       env: DJANGO=3.0
     - python: 3.7
       env: DJANGO=master
 
-    - python: 3.7
+    - python: 3.8
+      env: DJANGO=1.11
+    - python: 3.8
+      env: DJANGO=2.2
+    - python: 3.8
+      env: DJANGO=3.0
+    - python: 3.8
+      env: DJANGO=master
+
+    - python: 3.8
       env: TOXENV=black,flake8
 
     - stage: deploy
       script: skip
-      python: 3.7
+      python: 3.8
       after_success: true
       deploy:
         provider: pypi

docs/authorization.rst

@@ -184,4 +184,4 @@ For Django 2.0 and above:
       path('graphql', PrivateGraphQLView.as_view(graphiql=True, schema=schema)),
     ]
 
-.. _LoginRequiredMixin: https://docs.djangoproject.com/en/1.10/topics/auth/default/#the-loginrequired-mixin
+.. _LoginRequiredMixin: https://docs.djangoproject.com/en/dev/topics/auth/default/#the-loginrequired-mixin

docs/conf.py

@@ -60,18 +60,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Graphene Django"
-copyright = u"Graphene 2017"
-author = u"Syrus Akbary"
+project = "Graphene Django"
+copyright = "Graphene 2017"
+author = "Syrus Akbary"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u"1.0"
+version = "1.0"
 # The full version, including alpha/beta/rc tags.
-release = u"1.0.dev"
+release = "1.0.dev"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -276,7 +276,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "Graphene.tex", u"Graphene Documentation", u"Syrus Akbary", "manual")
+    (master_doc, "Graphene.tex", "Graphene Documentation", "Syrus Akbary", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -317,7 +317,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "graphene_django", u"Graphene Django Documentation", [author], 1)
+    (master_doc, "graphene_django", "Graphene Django Documentation", [author], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -334,7 +334,7 @@
     (
         master_doc,
         "Graphene-Django",
-        u"Graphene Django Documentation",
+        "Graphene Django Documentation",
         author,
         "Graphene Django",
         "One line description of project.",

docs/filtering.rst

@@ -2,8 +2,7 @@ Filtering
 =========
 
 Graphene integrates with
-`django-filter <https://django-filter.readthedocs.io/en/master/>`__ (2.x for
-Python 3 or 1.x for Python 2) to provide filtering of results. See the `usage
+`django-filter <https://django-filter.readthedocs.io/en/master/>`__ to provide filtering of results. See the `usage
 documentation <https://django-filter.readthedocs.io/en/master/guide/usage.html#the-filter>`__
 for details on the format for ``filter_fields``.
 

graphene_django/converter.py

@@ -1,4 +1,6 @@
 from collections import OrderedDict
+from functools import singledispatch
+
 from django.db import models
 from django.utils.encoding import force_str
 from django.utils.module_loading import import_string
@@ -21,21 +23,18 @@
 )
 from graphene.types.json import JSONString
 from graphene.utils.str_converters import to_camel_case, to_const
-from graphql import assert_valid_name
+from graphql import assert_valid_name, GraphQLError
 
 from .settings import graphene_settings
 from .compat import ArrayField, HStoreField, JSONField, RangeField
 from .fields import DjangoListField, DjangoConnectionField
-from .utils import import_single_dispatch
-
-singledispatch = import_single_dispatch()
 
 
 def convert_choice_name(name):
     name = to_const(force_str(name))
     try:
         assert_valid_name(name)
-    except AssertionError:
+    except GraphQLError:
         name = "A_%s" % name
     return name
 
@@ -65,7 +64,7 @@ def convert_choices_to_named_enum_with_descriptions(name, choices):
     class EnumWithDescriptionsType(object):
         @property
         def description(self):
-            return named_choices_descriptions[self.name]
+            return str(named_choices_descriptions[self.name])
 
     return Enum(name, list(named_choices), type=EnumWithDescriptionsType)
 
@@ -277,3 +276,12 @@ def convert_postgres_range_to_string(field, registry=None):
     if not isinstance(inner_type, (List, NonNull)):
         inner_type = type(inner_type)
     return List(inner_type, description=field.help_text, required=not field.null)
+
+
+from django.utils.functional import Promise
+from graphql.pyutils import register_description
+
+
+# Register Django lazy()-wrapped values as GraphQL description/help_text.
+# This is needed for using lazy translations, see https://github.com/graphql-python/graphql-core-next/issues/58.
+register_description(Promise)

graphene_django/debug/middleware.py

@@ -17,7 +17,7 @@ def get_debug_promise(self):
         if not self.debug_promise:
             self.debug_promise = Promise.all(self.promises)
             self.promises = []
-        return self.debug_promise.then(self.on_resolve_all_promises)
+        return self.debug_promise.then(self.on_resolve_all_promises).get()
 
     def on_resolve_all_promises(self, values):
         if self.promises:

graphene_django/debug/sql/tracking.py

@@ -5,7 +5,6 @@
 from threading import local
 from time import time
 
-import six
 from django.utils.encoding import force_str
 
 from .types import DjangoDebugSQL
@@ -77,7 +76,7 @@ def __init__(self, cursor, db, logger):
         self.logger = logger
 
     def _quote_expr(self, element):
-        if isinstance(element, six.string_types):
+        if isinstance(element, str):
             return "'%s'" % force_str(element).replace("'", "''")
         else:
             return repr(element)

graphene_django/debug/tests/test_query.py

@@ -75,7 +75,7 @@ class Meta:
 
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
-        debug = graphene.Field(DjangoDebug, name="__debug")
+        debug = graphene.Field(DjangoDebug, name="_debug")
 
         def resolve_reporter(self, info, **args):
             return Reporter.objects.first()
@@ -89,7 +89,7 @@ def resolve_reporter(self, info, **args):
               pets { edges { node { lastName } } }
             } } }
           }
-          __debug {
+          _debug {
             sql {
               rawSql
             }
@@ -117,12 +117,12 @@ def resolve_reporter(self, info, **args):
     )
     assert not result.errors
     query = str(Reporter.objects.order_by("pk")[:1].query)
-    assert result.data["__debug"]["sql"][0]["rawSql"] == query
-    assert "COUNT" in result.data["__debug"]["sql"][1]["rawSql"]
-    assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
-    assert "COUNT" in result.data["__debug"]["sql"][3]["rawSql"]
-    assert "tests_reporter_pets" in result.data["__debug"]["sql"][4]["rawSql"]
-    assert len(result.data["__debug"]["sql"]) == 5
+    assert result.data["_debug"]["sql"][0]["rawSql"] == query
+    assert "COUNT" in result.data["_debug"]["sql"][1]["rawSql"]
+    assert "tests_reporter_pets" in result.data["_debug"]["sql"][2]["rawSql"]
+    assert "COUNT" in result.data["_debug"]["sql"][3]["rawSql"]
+    assert "tests_reporter_pets" in result.data["_debug"]["sql"][4]["rawSql"]
+    assert len(result.data["_debug"]["sql"]) == 5
 
     assert result.data["reporter"] == expected["reporter"]
 

graphene_django/fields.py

@@ -1,12 +1,13 @@
 from functools import partial
 
-import six
 from django.db.models.query import QuerySet
-from graphql_relay.connection.arrayconnection import connection_from_list_slice
+from graphene.relay.connection import page_info_adapter, connection_adapter
+
+from graphql_relay.connection.arrayconnection import connection_from_array_slice
 from promise import Promise
 
 from graphene import NonNull
-from graphene.relay import ConnectionField, PageInfo
+from graphene.relay import ConnectionField
 from graphene.types import Field, List
 
 from .settings import graphene_settings
@@ -123,15 +124,15 @@ def resolve_connection(cls, connection, args, iterable):
             _len = iterable.count()
         else:
             _len = len(iterable)
-        connection = connection_from_list_slice(
+        connection = connection_from_array_slice(
             iterable,
             args,
             slice_start=0,
-            list_length=_len,
-            list_slice_length=_len,
-            connection_type=connection,
+            array_length=_len,
+            array_slice_length=_len,
+            connection_type=partial(connection_adapter, connection),
             edge_type=connection.Edge,
-            pageinfo_type=PageInfo,
+            page_info_type=page_info_adapter,
         )
         connection.iterable = iterable
         connection.length = _len

graphene_django/filter/filterset.py

@@ -1,7 +1,7 @@
 import itertools
 
 from django.db import models
-from django_filters import Filter, MultipleChoiceFilter, VERSION
+from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import BaseFilterSet, FilterSet
 from django_filters.filterset import FILTER_FOR_DBFIELD_DEFAULTS
 
@@ -50,36 +50,6 @@ class GrapheneFilterSetMixin(BaseFilterSet):
     )
 
 
-# To support a Django 1.11 + Python 2.7 combination django-filter must be
-# < 2.x.x. To support the earlier version of django-filter, the
-# filter_for_reverse_field method must be present on GrapheneFilterSetMixin and
-# must not be present for later versions of django-filter.
-if VERSION[0] < 2:
-    from django.utils.text import capfirst
-
-    class GrapheneFilterSetMixinPython2(GrapheneFilterSetMixin):
-        @classmethod
-        def filter_for_reverse_field(cls, f, name):
-            """Handles retrieving filters for reverse relationships
-             We override the default implementation so that we can handle
-            Global IDs (the default implementation expects database
-            primary keys)
-            """
-            try:
-                rel = f.field.remote_field
-            except AttributeError:
-                rel = f.field.rel
-            default = {"name": name, "label": capfirst(rel.related_name)}
-            if rel.multiple:
-                # For to-many relationships
-                return GlobalIDMultipleChoiceFilter(**default)
-            else:
-                # For to-one relationships
-                return GlobalIDFilter(**default)
-
-    GrapheneFilterSetMixin = GrapheneFilterSetMixinPython2
-
-
 def setup_filterset(filterset_class):
     """ Wrap a provided filterset in Graphene-specific functionality
     """