graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2025-09-21 19:32:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Jonathan Kim 2019-07-24 10:09:21 +01:00 committed by GitHub
commit b4cd0e2576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -6,7 +6,6 @@ python:
- "3.5" - "3.5"
- "3.6" - "3.6"
- "3.7" - "3.7"
- "pypy3"
install: install:
- pip install tox tox-travis - pip install tox tox-travis

2
docs/quickstart.rst
View File

@ -103,7 +103,7 @@ For each **Field** in our **Schema**, we write a **Resolver** method to fetch da
Schema Definition Language (SDL) Schema Definition Language (SDL)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In the `GraphQL Schema Definition Language`_, we could describe the feilds defined by our example code as show below. In the `GraphQL Schema Definition Language`_, we could describe the fields defined by our example code as show below.
.. _GraphQL Schema Definition Language: https://graphql.org/learn/schema/ .. _GraphQL Schema Definition Language: https://graphql.org/learn/schema/

2
graphene/__init__.py
View File

@ -43,7 +43,7 @@ from .utils.resolve_only_args import resolve_only_args
from .utils.module_loading import lazy_import from .utils.module_loading import lazy_import
VERSION = (2, 1, 6, "final", 0) VERSION = (2, 1, 7, "final", 0)
__version__ = get_version(VERSION) __version__ = get_version(VERSION)

2
setup.py
View File

@ -86,7 +86,7 @@ setup(
install_requires=[ install_requires=[
"six>=1.10.0,<2", "six>=1.10.0,<2",
"graphql-core>=2.1,<3", "graphql-core>=2.1,<3",
"graphql-relay>=0.4.5,<1", "graphql-relay>=2,<3",
"aniso8601>=3,<=7", "aniso8601>=3,<=7",
], ],
tests_require=tests_require, tests_require=tests_require,