Merge pull request #11 from strollby/pagination-fix-v2

Pagination fix v2

.github/workflows/lint.yml

@@ -22,6 +22,6 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8
-    - name: Lint with flake8
+        pip install ruff
+    - name: Lint with ruff
       run: make lint

Makefile

@@ -11,7 +11,8 @@ clean:
 	@find . -name "__pycache__" -delete
 
 lint:
-	@flake8 graphene_mongo --count --show-source --statistics
+	@ruff check graphene_mongo
+	@ruff format . --check
 
 test: clean
 	pytest graphene_mongo/tests --cov=graphene_mongo --cov-report=html --cov-report=term

docs/conf.py

@@ -60,18 +60,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Graphene Mongo"
-copyright = u"Graphene 2018"
-author = u"Abaw Chen"
+project = "Graphene Mongo"
+copyright = "Graphene 2018"
+author = "Abaw Chen"
 
 # 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"0.1"
+version = "0.1"
 # The full version, including alpha/beta/rc tags.
-release = u"0.1.2"
+release = "0.1.2"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -275,9 +275,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (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")
-]
+latex_documents = [(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
 # the title page.
@@ -316,9 +314,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)
-]
+man_pages = [(master_doc, "graphene_django", "Graphene Django Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 #
@@ -334,7 +330,7 @@
     (
         master_doc,
         "Graphene-Django",
-        u"Graphene Django Documentation",
+        "Graphene Django Documentation",
         author,
         "Graphene Django",
         "One line description of project.",

examples/django_mongoengine/bike/urls.py

@@ -3,7 +3,5 @@
 from graphene_django.views import GraphQLView
 
 urlpatterns = [
-    path(
-        "graphql", csrf_exempt(GraphQLView.as_view(graphiql=True)), name="graphql-query"
-    )
+    path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True)), name="graphql-query")
 ]

examples/django_mongoengine/bike_catalog/settings.py

@@ -85,9 +85,7 @@
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
-    },
+    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"},
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},

examples/django_mongoengine/bike_catalog/settings_test.py

@@ -1,5 +1,3 @@
 from .settings import *  # flake8: noqa
 
-mongoengine.connect(
-    "graphene-mongo-test", host="mongomock://localhost", alias="default"
-)
+mongoengine.connect("graphene-mongo-test", host="mongomock://localhost", alias="default")

examples/falcon_mongoengine/api.py

@@ -3,9 +3,7 @@
 from .schema import schema
 
 
-def set_graphql_allow_header(
-    req: falcon.Request, resp: falcon.Response, resource: object
-):
+def set_graphql_allow_header(req: falcon.Request, resp: falcon.Response, resource: object):
     resp.set_header("Allow", "GET, POST, OPTIONS")
 
 

examples/falcon_mongoengine/tests/tests.py

@@ -1,11 +1,10 @@
 import mongoengine
 from graphene.test import Client
+
 from examples.falcon_mongoengine.schema import schema
 from .fixtures import fixtures_data
 
-mongoengine.connect(
-    "graphene-mongo-test", host="mongomock://localhost", alias="default"
-)
+mongoengine.connect("graphene-mongo-test", host="mongomock://localhost", alias="default")
 
 
 def test_category_last_1_item_query(fixtures_data):
@@ -23,7 +22,16 @@ def test_category_last_1_item_query(fixtures_data):
 
     expected = {
         "data": {
-            "categories": {"edges": [{"node": {"name": "Work", "color": "#1769ff"}}]}
+            "categories": {
+                "edges": [
+                    {
+                        "node": {
+                            "name": "Work",
+                            "color": "#1769ff",
+                        }
+                    }
+                ]
+            }
         }
     }
 
@@ -45,11 +53,7 @@ def test_category_filter_item_query(fixtures_data):
                }
            }"""
 
-    expected = {
-        "data": {
-            "categories": {"edges": [{"node": {"name": "Work", "color": "#1769ff"}}]}
-        }
-    }
+    expected = {"data": {"categories": {"edges": [{"node": {"name": "Work", "color": "#1769ff"}}]}}}
 
     client = Client(schema)
     result = client.execute(query)

examples/flask_mongoengine/app.py

@@ -42,9 +42,7 @@
   }
 }""".strip()
 
-app.add_url_rule(
-    "/graphql", view_func=GraphQLView.as_view("graphql", schema=schema, graphiql=True)
-)
+app.add_url_rule("/graphql", view_func=GraphQLView.as_view("graphql", schema=schema, graphiql=True))
 
 if __name__ == "__main__":
     init_db()

examples/flask_mongoengine/models.py

@@ -10,25 +10,21 @@
 
 
 class Department(Document):
-
     meta = {"collection": "department"}
     name = StringField()
 
 
 class Role(Document):
-
     meta = {"collection": "role"}
     name = StringField()
 
 
 class Task(EmbeddedDocument):
-
     name = StringField()
     deadline = DateTimeField(default=datetime.now)
 
 
 class Employee(Document):
-
     meta = {"collection": "employee"}
     name = StringField()
     hired_on = DateTimeField(default=datetime.now)

examples/flask_mongoengine/schema.py

@@ -1,6 +1,5 @@
 import graphene
 from graphene.relay import Node
-from graphene_mongo.tests.nodes import PlayerNode, ReporterNode
 
 from graphene_mongo import MongoengineConnectionField, MongoengineObjectType
 from .models import Department as DepartmentModel
@@ -20,7 +19,11 @@ class Meta:
         model = RoleModel
         interfaces = (Node,)
         filter_fields = {
-            'name': ['exact', 'icontains', 'istartswith']
+            "name": [
+                "exact",
+                "icontains",
+                "istartswith",
+            ]
         }
 
 
@@ -35,7 +38,11 @@ class Meta:
         model = EmployeeModel
         interfaces = (Node,)
         filter_fields = {
-            'name': ['exact', 'icontains', 'istartswith']
+            "name": [
+                "exact",
+                "icontains",
+                "istartswith",
+            ]
         }
 
 

graphene_mongo/__init__.py

@@ -13,5 +13,5 @@
     "MongoengineInputType",
     "MongoengineInterfaceType",
     "MongoengineConnectionField",
-    "AsyncMongoengineConnectionField"
+    "AsyncMongoengineConnectionField",
 ]

graphene_mongo/advanced_types.py

@@ -1,4 +1,5 @@
 import base64
+
 import graphene
 
 
@@ -65,5 +66,9 @@ class PolygonFieldType(_CoordinatesTypeField):
 
 class MultiPolygonFieldType(_CoordinatesTypeField):
     coordinates = graphene.List(
-        graphene.List(graphene.List(graphene.List(graphene.Float)))
+        graphene.List(
+            graphene.List(
+                graphene.List(graphene.Float),
+            )
+        )
     )