Merge branch 'master' into sdr/subclass_mutations

Author: syrusakbary

.pre-commit-config.yaml

@@ -2,30 +2,23 @@ repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks
     rev: v1.3.0
     hooks:
-    -   id: autopep8-wrapper
-        args:
-        - -i
-        - --ignore=E128,E309,E501
-        exclude: ^docs/.*$
     -   id: check-json
     -   id: check-yaml
     -   id: debug-statements
     -   id: end-of-file-fixer
         exclude: ^docs/.*$
     -   id: trailing-whitespace
+        exclude: README.md
     -   id: pretty-format-json
         args:
         - --autofix
     -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.2.0
+    rev: v1.4.0
     hooks:
     -   id: pyupgrade
--   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.0.0
-    hooks:
-    -   id: seed-isort-config
--   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.4
+-   repo: https://github.com/ambv/black
+    rev: 18.6b4
     hooks:
-    -   id: isort
+    - id: black
+      language_version: python3.6

.travis.yml

@@ -1,64 +1,28 @@
 language: python
-sudo: false
-python:
-- 2.7
-- 3.5
-- 3.6
-# - "pypy-5.3.1"
-before_install:
-- |
-  if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
-    export PYENV_ROOT="$HOME/.pyenv"
-    if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
-      cd "$PYENV_ROOT" && git pull
-    else
-      rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
-    fi
-    export PYPY_VERSION="4.0.1"
-    "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
-    virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-    source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
-  fi
-install:
-- |
-  if [ "$TEST_TYPE" = build ]; then
-    pip install -e .[test]
-    python setup.py develop
-  elif [ "$TEST_TYPE" = lint ]; then
-    pip install flake8
-  elif [ "$TEST_TYPE" = mypy ]; then
-    pip install mypy
-  fi
-script:
-- |
-  if [ "$TEST_TYPE" = lint ]; then
-    echo "Checking Python code lint."
-    flake8 graphene
-    exit
-  elif [ "$TEST_TYPE" = mypy ]; then
-    echo "Checking Python types."
-    mypy graphene
-    exit
-  elif [ "$TEST_TYPE" = build ]; then
-    py.test --cov=graphene graphene examples
-  fi
-after_success:
-- |
-  if [ "$TEST_TYPE" = build ]; then
-      coveralls
-  fi
-env:
-  matrix:
-  - TEST_TYPE=build
-  global:
-    secure: SQC0eCWCWw8bZxbLE8vQn+UjJOp3Z1m779s9SMK3lCLwJxro/VCLBZ7hj4xsrq1MtcFO2U2Kqf068symw4Hr/0amYI3HFTCFiwXAC3PAKXeURca03eNO2heku+FtnQcOjBanExTsIBQRLDXMOaUkf3MIztpLJ4LHqMfUupKmw9YSB0v40jDbSN8khBnndFykmOnVVHznFp8USoN5F0CiPpnfEvHnJkaX76lNf7Kc9XNShBTTtJsnsHMhuYQeInt0vg9HSjoIYC38Tv2hmMj1myNdzyrHF+LgRjI6ceGi50ApAnGepXC/DNRhXROfECKez+LON/ZSqBGdJhUILqC8A4WmWmIjNcwitVFp3JGBqO7LULS0BI96EtSLe8rD1rkkdTbjivajkbykM1Q0Tnmg1adzGwLxRUbTq9tJQlTTkHBCuXIkpKb1mAtb/TY7A6BqfnPi2xTc/++qEawUG7ePhscdTj0IBrUfZsUNUYZqD8E8XbSWKIuS3SHE+cZ+s/kdAsm4q+FFAlpZKOYGxIkwvgyfu4/Plfol4b7X6iAP9J3r1Kv0DgBVFst5CXEwzZs19/g0CgokQbCXf1N+xeNnUELl6/fImaR3RKP22EaABoil4z8vzl4EqxqVoH1nfhE+WlpryXsuSaF/1R+WklR7aQ1FwoCk8V8HxM2zrj4tI8k=
 matrix:
-  fast_finish: true
   include:
-  - python: '2.7'
-    env: TEST_TYPE=lint
-  - python: '3.6'
-    env: TEST_TYPE=mypy
+    -  env: TOXENV=py27
+       python: 2.7
+    -  env: TOXENV=py34
+       python: 3.4
+    -  env: TOXENV=py35
+       python: 3.5
+    -  env: TOXENV=py36
+       python: 3.6
+    -  env: TOXENV=pypy
+       python: pypy-5.7.1
+    -  env: TOXENV=pre-commit
+       python: 3.6
+    -  env: TOXENV=mypy
+       python: 3.6
+install:
+  - pip install coveralls tox
+script: tox
+after_success: coveralls
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - $HOME/.cache/pre-commit
 deploy:
   provider: pypi
   user: syrusakbary

docs/conf.py

@@ -2,7 +2,7 @@
 
 import sphinx_graphene_theme
 
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 # -*- coding: utf-8 -*-
 #
@@ -36,46 +36,44 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
 ]
 if not on_rtd:
-    extensions += [
-        'sphinx.ext.githubpages',
-    ]
+    extensions += ["sphinx.ext.githubpages"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 #
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'Graphene'
-copyright = u'Graphene 2016'
-author = u'Syrus Akbary'
+project = u"Graphene"
+copyright = u"Graphene 2016"
+author = u"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 = u"1.0"
 # The full version, including alpha/beta/rc tags.
-release = u'1.0'
+release = u"1.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -96,7 +94,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -118,7 +116,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -175,7 +173,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -255,34 +253,30 @@
 # html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Graphenedoc'
+htmlhelp_basename = "Graphenedoc"
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
-
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
-
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
-
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
 }
 
 # 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'),
+    (master_doc, "Graphene.tex", u"Graphene Documentation", u"Syrus Akbary", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -322,10 +316,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'graphene', u'Graphene Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "graphene", u"Graphene Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 #
@@ -338,9 +329,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Graphene', u'Graphene Documentation',
-     author, 'Graphene', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "Graphene",
+        u"Graphene Documentation",
+        author,
+        "Graphene",
+        "One line description of project.",
+        "Miscellaneous",
+    )
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -414,7 +411,7 @@
 # epub_post_files = []
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 # The depth of the table of contents in toc.ncx.
 #
@@ -447,9 +444,15 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'https://docs.python.org/': None,
-    'python': ('https://docs.python.org/', None),
-    'graphene_django': ('http://docs.graphene-python.org/projects/django/en/latest/', None),
-    'graphene_sqlalchemy': ('http://docs.graphene-python.org/projects/sqlalchemy/en/latest/', None),
-    'graphene_gae': ('http://docs.graphene-python.org/projects/gae/en/latest/', None),
+    "https://docs.python.org/": None,
+    "python": ("https://docs.python.org/", None),
+    "graphene_django": (
+        "http://docs.graphene-python.org/projects/django/en/latest/",
+        None,
+    ),
+    "graphene_sqlalchemy": (
+        "http://docs.graphene-python.org/projects/sqlalchemy/en/latest/",
+        None,
+    ),
+    "graphene_gae": ("http://docs.graphene-python.org/projects/gae/en/latest/", None),
 }

examples/complex_example.py

@@ -22,7 +22,6 @@ def resolve_address(self, info, geo):
 
 
 class CreateAddress(graphene.Mutation):
-
     class Arguments:
         geo = GeoInput(required=True)
 
@@ -37,42 +36,34 @@ class Mutation(graphene.ObjectType):
 
 
 schema = graphene.Schema(query=Query, mutation=Mutation)
-query = '''
+query = """
     query something{
       address(geo: {lat:32.2, lng:12}) {
         latlng
       }
     }
-'''
-mutation = '''
+"""
+mutation = """
     mutation addAddress{
       createAddress(geo: {lat:32.2, lng:12}) {
         latlng
       }
     }
-'''
+"""
 
 
 def test_query():
     result = schema.execute(query)
     assert not result.errors
-    assert result.data == {
-        'address': {
-            'latlng': "(32.2,12.0)",
-        }
-    }
+    assert result.data == {"address": {"latlng": "(32.2,12.0)"}}
 
 
 def test_mutation():
     result = schema.execute(mutation)
     assert not result.errors
-    assert result.data == {
-        'createAddress': {
-            'latlng': "(32.2,12.0)",
-        }
-    }
+    assert result.data == {"createAddress": {"latlng": "(32.2,12.0)"}}
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     result = schema.execute(query)
-    print(result.data['address']['latlng'])
+    print(result.data["address"]["latlng"])