More flake8 issues and minor clean-up

Author: Cito

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-ignore = E203,W503,E704
+ignore = E203,W503,W503
 exclude = .git,.mypy_cache,.pytest_cache,.tox,.venv,__pycache__,build,dist,docs
 max-line-length = 88

.gitignore

@@ -1,9 +1,6 @@
 __pycache__/
 *.py[cod]
 
-*.so
-
-# Distribution / packaging
 .Python
 build/
 develop-eggs/
@@ -41,7 +38,6 @@ coverage.xml
 *.cover
 .pytest_cache/
 
-# Translations
 *.mo
 *.pot
 

graphql_relay/connection/arrayconnection.py

@@ -4,13 +4,14 @@
 from .connectiontypes import Connection, PageInfo, Edge
 
 
-def connection_from_list(data, args=None, connection_type=None,
-        edge_type=None, pageinfo_type=None):
-    '''
+def connection_from_list(
+        data, args=None,
+        connection_type=None, edge_type=None, pageinfo_type=None):
+    """
     A simple function that accepts an array and connection arguments, and returns
     a connection object for use in GraphQL. It uses array offsets as pagination,
     so pagination will only work if the array is static.
-    '''
+    """
     _len = len(data)
     return connection_from_list_slice(
         data,
@@ -25,17 +26,17 @@ def connection_from_list(data, args=None, connection_type=None,
 
 
 def connection_from_list_slice(
-        list_slice, args=None, connection_type=None,
-        edge_type=None, pageinfo_type=None,
+        list_slice, args=None,
+        connection_type=None, edge_type=None, pageinfo_type=None,
         slice_start=0, list_length=0, list_slice_length=None):
-    '''
+    """
     Given a slice (subset) of an array, returns a connection object for use in
     GraphQL.
     This function is similar to `connectionFromArray`, but is intended for use
     cases where you know the cardinality of the connection, consider it too large
     to materialize the entire array, and instead wish pass in a slice of the
     total result large enough to cover the range specified in `args`.
-    '''
+    """
     connection_type = connection_type or Connection
     edge_type = edge_type or Edge
     pageinfo_type = pageinfo_type or PageInfo
@@ -106,26 +107,26 @@ def connection_from_list_slice(
 
 
 def offset_to_cursor(offset):
-    '''
+    """
     Creates the cursor string from an offset.
-    '''
+    """
     return base64(PREFIX + str(offset))
 
 
 def cursor_to_offset(cursor):
-    '''
+    """
     Rederives the offset from the cursor string.
-    '''
+    """
     try:
         return int(unbase64(cursor)[len(PREFIX):])
     except binascii.Error:
         return None
 
 
 def cursor_for_object_in_connection(data, _object):
-    '''
+    """
     Return the cursor associated with an object in an array.
-    '''
+    """
     if _object not in data:
         return None
 
@@ -134,11 +135,11 @@ def cursor_for_object_in_connection(data, _object):
 
 
 def get_offset_with_default(cursor=None, default_offset=0):
-    '''
+    """
     Given an optional cursor and a default offset, returns the offset
     to use; if the cursor contains a valid offset, that will be used,
     otherwise it will be the default.
-    '''
+    """
     if not isinstance(cursor, str):
         return default_offset
 

graphql_relay/connection/tests/test_connection.py

@@ -34,7 +34,7 @@
         'friends': GraphQLField(
             friendConnection,
             args=connection_args,
-            resolve=lambda user, info_, **args:
+            resolve=lambda user, _info, **args:
             connection_from_list(user.friends, args),
         ),
     },
@@ -43,7 +43,7 @@
 friendEdge, friendConnection = connection_definitions(
     'Friend',
     userType,
-    resolve_node=lambda edge, *_: allUsers[edge.node],
+    resolve_node=lambda edge, _info: allUsers[edge.node],
     edge_fields=lambda: {
         'friendshipTime': GraphQLField(
             GraphQLString,
@@ -53,7 +53,7 @@
     connection_fields=lambda: {
         'totalCount': GraphQLField(
             GraphQLInt,
-            resolve=lambda user_, info_: len(allUsers) - 1
+            resolve=lambda _user, _info: len(allUsers) - 1
         ),
     }
 )
@@ -63,7 +63,7 @@
     fields=lambda: {
         'user': GraphQLField(
             userType,
-            resolve=lambda root_, info_: allUsers[0]
+            resolve=lambda _root, _info: allUsers[0]
         ),
     }
 )

graphql_relay/node/node.py

@@ -10,7 +10,7 @@
 
 
 def node_definitions(id_fetcher, type_resolver=None):
-    '''
+    """
     Given a function to map from an ID to an underlying object, and a function
     to map from an underlying object to the concrete GraphQLObjectType it
     corresponds to, constructs a `Node` interface that objects can implement,
@@ -19,7 +19,7 @@ def node_definitions(id_fetcher, type_resolver=None):
     If the type_resolver is omitted, object resolution on the interface will be
     handled with the `is_type_of` method on object types, as with any GraphQL
     interface without a provided `resolve_type` method.
-    '''
+    """
     node_interface = GraphQLInterfaceType(
         'Node',
         description='An object with an ID',
@@ -37,36 +37,36 @@ def node_definitions(id_fetcher, type_resolver=None):
             'id': GraphQLArgument(
                 GraphQLNonNull(GraphQLID),
                 description='The ID of an object')},
-        resolve=lambda obj, info, id: id_fetcher(id, info)
+        resolve=lambda _obj, info, id: id_fetcher(id, info)
     )
     return node_interface, node_field
 
 
 def to_global_id(type_, id_):
-    '''
+    """
     Takes a type name and an ID specific to that type name, and returns a
     "global ID" that is unique among all types.
-    '''
+    """
     return base64(':'.join([type_, str(id_)]))
 
 
 def from_global_id(global_id):
-    '''
+    """
     Takes the "global ID" created by toGlobalID, and retuns the type name and ID
     used to create it.
-    '''
+    """
     unbased_global_id = unbase64(global_id)
     _type, _id = unbased_global_id.split(':', 1)
     return _type, _id
 
 
 def global_id_field(type_name, id_fetcher=None):
-    '''
+    """
     Creates the configuration for an id field on a node, using `to_global_id` to
     construct the ID from the provided typename. The type-specific ID is fetcher
     by calling id_fetcher on the object, or if not provided, by accessing the `id`
     property on the object.
-    '''
+    """
     return GraphQLField(
         GraphQLNonNull(GraphQLID),
         description='The ID of an object',

graphql_relay/node/tests/test_global.py

@@ -28,15 +28,15 @@
 }
 
 
-def get_node(global_id, *args):
+def get_node(global_id, _info):
     _type, _id = from_global_id(global_id)
     if _type == 'User':
         return userData[_id]
     else:
         return photoData[_id]
 
 
-def get_node_type(obj, context, info):
+def get_node_type(obj, _info, _type):
     if isinstance(obj, User):
         return userType
     else:

graphql_relay/node/tests/test_plural.py

@@ -38,9 +38,9 @@ def resolve_single_input(info, username):
 
 schema = GraphQLSchema(query=queryType)
 
-RootValue = namedtuple('RootValue', ['lang'])
 
-root_value = RootValue(lang='en')
+class RootValue:
+    lang = 'en'
 
 
 @mark.asyncio
@@ -69,7 +69,7 @@ async def test_allows_fetching():
             },
         ]
     }
-    result = await graphql(schema, query, root_value=root_value)
+    result = await graphql(schema, query, root_value=RootValue())
     assert not result.errors
     assert result.data == expected
 

setup.py

@@ -46,7 +46,7 @@ def run_tests(self):
     license='MIT',
 
     classifiers=[
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         "License :: OSI Approved :: MIT License",
@@ -56,14 +56,14 @@ def run_tests(self):
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 
-    keywords='graphql relay api ',
+    keywords='graphql relay api',
 
     packages=find_packages(exclude=['tests']),
 
     install_requires=[
         'graphql-core-next>=1.0.5',
     ],
-    tests_require=['pytest', 'pytest-asyncio'],
+    tests_require=['pytest>=5', 'pytest-asyncio>=0.10'],
     extras_require={},
 
     cmdclass={'test': PyTest},

tests/starwars/data.py

@@ -1,8 +1,9 @@
-# This defines a basic set of data for our Star Wars Schema.
-#
-# This data is hard coded for the sake of the demo, but you could imagine
-# fetching this data from a backend service rather than from hardcoded
-# JSON objects in a more complex demo.
+"""This defines a basic set of data for our Star Wars Schema.
+
+This data is hard coded for the sake of the demo, but you could imagine
+fetching this data from a backend service rather than from hardcoded
+JSON objects in a more complex demo.
+"""
 
 from collections import namedtuple
 

tests/starwars/test_mutations.py

@@ -6,7 +6,7 @@
 
 
 @mark.asyncio
-async def test_correctely_mutates_dataset():
+async def test_correctly_mutates_dataset():
     query = '''
       mutation AddBWingQuery($input: IntroduceShipInput!) {
         introduceShip(input: $input) {