Revert to where we started the 'next' branch

Author: Cito

.flake8

@@ -1,7 +1,16 @@
+# Created by https://www.gitignore.io
+
+### Python ###
+# Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 
+# C extensions
+*.so
+
+# Distribution / packaging
 .Python
+env/
 build/
 develop-eggs/
 dist/
@@ -13,50 +22,40 @@ lib64/
 parts/
 sdist/
 var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-MANIFEST
 
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
+# Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
 
+# Unit test / coverage reports
 htmlcov/
 .tox/
-.nox/
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
-*.cover
-.pytest_cache/
+*,cover
 
+# Translations
 *.mo
 *.pot
 
+# Django stuff:
 *.log
 
+# Sphinx documentation
 docs/_build/
 
+# PyBuilder
 target/
 
-.python-version
-
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-.mypy_cache/
-
-.idea/

.gitignore

@@ -2,30 +2,17 @@ language: python
 dist: xenial
 
 python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "pypy3"
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
+  - pypy3
 install:
+  - pip install pytest pytest-cov flake8
   - pip install .
-  - pip install "flake8>=3.7,<4"
 script:
-  - python setup.py test -a "--cov=graphql_relay"
-  - flake8 setup.py src tests
+  - py.test --cov=graphql_relay
+# - flake8
 after_success:
   - pip install coveralls
   - coveralls
-
-deploy:
-  provider: pypi
-  distributions: sdist bdist_wheel
-  on:
-    branch: master
-    tags: true
-    python: 3.7
-  skip_existing: true
-  user: mvanlonden
-  password:
-    secure: gu79sV5e3wkUI8eH20TbBRctOOGkuWe6EQUjJP17q1Jm15/sJsehOaaLPiG0psxtqBGABp+z+xXkjhRfNMowY2xJPLjGmpF23pOIWGjBWKLKXzJStegKM6kwJYyHzcykIhBEb74047FhqhcwOgZcsp6sZpfzuby+onevLzPDI0C4jTARw7WAqMln9JIBZJyoQKp9fpr8AoXL2JtHr6sjkeJ94lz1XViL9rtTo7qFYfqYS3XdKO0wJhLfMUXSihIzSWQykBVv+75tMKQr0CtGALXcJSRGT6Sb31GiFyG93rtcOcBvbjFt1MK8aNKyIMhwgSqjcgKvxWAvXn4MsCaabHPVEv0YuT9t9cQzaAvi81LqHkpALgpDfXFfsMzHG18/8ME9TpM8u52r/ST5lhukglfnxWVy4hg8VLZ0iiTtpS3hx1Ba4Uecr++6fI5X+KL3EPabApQM+t4rcC0h4mEbjq3IkZ/ANAIJ2UjKTMcUkbQbKqJ1MY4xQyw+vVugffBmhEWSb4GnQPEadMGD6qfUI+t7epDP0ipp67rOiUooFYGabQp40pf7MxFPG23fvJ3JWbo3fzcIRmQiSalrIL1gFXH2DQnv4xhZvwnci+dIK29mamH0CfmjAJ8BdfzRsjV156BZbfkzXRfWDMes9G2E8S27xJJ2N4ySNIMkaXsu1u4=
-

.travis.yml

@@ -1,13 +1,4 @@
-include MANIFEST.in
-
+global-exclude tests/*
+recursive-exclude tests *
+recursive-exclude tests_py35 *
 include LICENSE
-include README.md
-
-include .flake8
-
-include tox.ini
-
-graft src/graphql_relay
-graft tests
-
-global-exclude *.py[co] __pycache__

MANIFEST.in

@@ -36,7 +36,7 @@ that documentation and the corresponding tests in this library together.
 Install Relay Library for GraphQL Python
 
 ```sh
-pip install "graphql-core>=2,<3" # use version 2.x of graphql-core
+pip install graphql-core --pre # Last version of graphql-core
 pip install graphql-relay
 ```
 
@@ -54,13 +54,13 @@ returning those types.
 they return a connection type.
  - `connection_definitions` returns a `connection_type` and its associated
 `edgeType`, given a name and a node type.
- - `connection_from_list` is a helper method that takes a list and the
+ - `connection_from_list` is a helper method that takes an array and the
 arguments from `connection_args`, does pagination and filtering, and returns
 an object in the shape expected by a `connection_type`'s `resolver` function.
  - `connection_from_promised_list` is similar to `connection_from_list`, but
 it takes a promise that resolves to an array, and returns a promise that
 resolves to the expected shape by `connection_type`.
- - `cursor_for_object_in_connection` is a helper method that takes a list and a
+ - `cursor_for_object_in_connection` is a helper method that takes an array and a
 member object, and returns a cursor for use in the mutation payload.
 
 An example usage of these methods from the [test schema](tests/starwars/schema.py):
@@ -69,31 +69,32 @@ An example usage of these methods from the [test schema](tests/starwars/schema.p
 ship_edge, ship_connection = connection_definitions('Ship', shipType)
 
 factionType = GraphQLObjectType(
-    name='Faction',
-    description='A faction in the Star Wars saga',
+    name= 'Faction',
+    description= 'A faction in the Star Wars saga',
     fields= lambda: {
         'id': global_id_field('Faction'),
         'name': GraphQLField(
             GraphQLString,
             description='The name of the faction.',
         ),
         'ships': GraphQLField(
-            ship_connection,
-            description='The ships used by the faction.',
-            args=connection_args,
-            resolver=lambda faction, _info, **args: connection_from_list(
-                [getShip(ship) for ship in faction.ships], args
+            shipConnection,
+            description= 'The ships used by the faction.',
+            args= connection_args,
+            resolver= lambda faction, args, *_: connection_from_list(
+                map(getShip, faction.ships),
+                args
             ),
         )
     },
-    interfaces=[node_interface]
+    interfaces= [node_interface]
 )
 ```
 
 This shows adding a `ships` field to the `Faction` object that is a connection.
 It uses `connection_definitions({name: 'Ship', nodeType: shipType})` to create
 the connection type, adds `connection_args` as arguments on this function, and
-then implements the resolver function by passing the list of ships and the
+then implements the resolver function by passing the array of ships and the
 arguments to `connection_from_list`.
 
 ### Object Identification
@@ -107,7 +108,7 @@ this, it takes a function to resolve an ID to an object, and to determine
 the type of a given object.
  - `to_global_id` takes a type name and an ID specific to that type name,
 and returns a "global ID" that is unique among all types.
- - `from_global_id` takes the "global ID" created by `to_global_id`, and returns
+ - `from_global_id` takes the "global ID" created by `toGlobalID`, and retuns
 the type name and ID used to create it.
  - `global_id_field` creates the configuration for an `id` field on a node.
  - `plural_identifying_root_field` creates a field that accepts a list of
@@ -117,16 +118,17 @@ objects.
 An example usage of these methods from the [test schema](tests/starwars/schema.py):
 
 ```python
-def get_node(global_id, _info):
-    type_, id_ = from_global_id(global_id)
-    if type_ == 'Faction':
-        return getFaction(id_)
-    elif type_ == 'Ship':
-        return getShip(id_)
+def get_node(global_id, context, info):
+    resolvedGlobalId = from_global_id(global_id)
+    _type, _id = resolvedGlobalId.type, resolvedGlobalId.id
+    if _type == 'Faction':
+        return getFaction(_id)
+    elif _type == 'Ship':
+        return getShip(_id)
     else:
         return None
 
-def get_node_type(obj, _info):
+def get_node_type(obj, context, info):
     if isinstance(obj, Faction):
         return factionType
     else:
@@ -175,9 +177,11 @@ class IntroduceShipMutation(object):
     def __init__(self, shipId, factionId, clientMutationId=None):
         self.shipId = shipId
         self.factionId = factionId
-        self.clientMutationId = clientMutationId
+        self.clientMutationId = None
 
-def mutate_and_get_payload(_info, shipName, factionId, **_input):
+def mutate_and_get_payload(data, *_):
+    shipName = data.get('shipName')
+    factionId = data.get('factionId')
     newShip = createShip(shipName, factionId)
     return IntroduceShipMutation(
         shipId=newShip.id,
@@ -197,19 +201,19 @@ shipMutation = mutation_with_client_mutation_id(
     output_fields= {
         'ship': GraphQLField(
             shipType,
-            resolver=lambda payload, _info: getShip(payload.shipId)
+            resolver= lambda payload, *_: getShip(payload.shipId)
         ),
         'faction': GraphQLField(
             factionType,
-            resolver=lambda payload, _info: getFaction(payload.factionId)
+            resolver= lambda payload, *_: getFaction(payload.factionId)
         )
     },
     mutate_and_get_payload=mutate_and_get_payload
 )
 
 mutationType = GraphQLObjectType(
     'Mutation',
-    fields=lambda: {
+    fields= lambda: {
         'introduceShip': shipMutation
     }
 )