Skip to content

[WIP] Road to 2.0 #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 86 commits into from
Aug 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
c98d91b
Simplified Interface code
syrusakbary Jul 12, 2017
e487206
Simplified ObjectType logic
syrusakbary Jul 12, 2017
5ee6e2b
Simplified Scalar
syrusakbary Jul 12, 2017
d8b42dd
Simplified InputObjectType
syrusakbary Jul 12, 2017
2d557d6
Simplified mutation
syrusakbary Jul 12, 2017
f0edcb2
Removed AbstractType
syrusakbary Jul 12, 2017
b78b8c4
Removed unused code
syrusakbary Jul 12, 2017
02c203f
Simplified Union implementation
syrusakbary Jul 12, 2017
858343a
Removed unused functions
syrusakbary Jul 12, 2017
3604c8f
Improved mutation class
syrusakbary Jul 12, 2017
9ce1288
Improved Enum implementation
syrusakbary Jul 12, 2017
e86f73d
Added class arguments example for Python 3
syrusakbary Jul 12, 2017
28c987b
Improved docs for extending Option attrs
syrusakbary Jul 12, 2017
58b04df
Updated Readme docs
syrusakbary Jul 12, 2017
e380078
Fixed upgrade doc title
syrusakbary Jul 12, 2017
563ca23
Make init_subclass work in Python 3.5
syrusakbary Jul 12, 2017
4820a7f
Improved Mutation
syrusakbary Jul 12, 2017
7a6d741
Fixed relay ClientIDMutation
syrusakbary Jul 12, 2017
a023aeb
Simplified Node type
syrusakbary Jul 12, 2017
6321c52
Fixed Connection tests
syrusakbary Jul 13, 2017
3fbc328
Fixed Python 3.5 issues with Enum
syrusakbary Jul 13, 2017
f1624af
Fixed Flake issues
syrusakbary Jul 13, 2017
ec5697b
Fixed Connection side effects and add into breaking changes.
syrusakbary Jul 13, 2017
8ff3380
Removed testing in Python 3.4 and start testing in 3.6
syrusakbary Jul 13, 2017
26686da
Added inputobjecttype containers
syrusakbary Jul 23, 2017
f7fdc9a
Initial version of function annotations
syrusakbary Jul 23, 2017
d2f1024
Added annotated resolver and context
syrusakbary Jul 24, 2017
b892eee
Removed unnecessary files
syrusakbary Jul 24, 2017
b185f4c
Improved mutation with thenable check
syrusakbary Jul 24, 2017
fb4b4df
Added auto resolver function
syrusakbary Jul 24, 2017
6ae9717
Improved automatic resolver args from annotations
syrusakbary Jul 24, 2017
8bac3dc
Use latest graphql-core and promise lib
syrusakbary Jul 24, 2017
85d3145
Improved abstract type
syrusakbary Jul 24, 2017
287a7a8
Added package test requirements into travis excluding setup
syrusakbary Jul 24, 2017
8c3a933
Fixed test 425 url
syrusakbary Jul 24, 2017
f8561fa
Fixed travis
syrusakbary Jul 24, 2017
6c4f462
Fixed Python 2/3 issues and flake syntax issues
syrusakbary Jul 24, 2017
907a3d9
Fixed Python 3.5 issues
syrusakbary Jul 24, 2017
66468e3
Improved Upgrade guide
syrusakbary Jul 24, 2017
40a15bd
Improved test coverage
syrusakbary Jul 24, 2017
800fbdf
Use dev version of graphql-core and promise
syrusakbary Jul 24, 2017
9769612
Make resolvers simple again
syrusakbary Jul 24, 2017
0e355ee
Improved documentation examples
syrusakbary Jul 24, 2017
df58b9a
Remove _is_annotated flag from annotate decorator
syrusakbary Jul 24, 2017
dba6256
Changed version to 2.0.dev
syrusakbary Jul 24, 2017
33a30db
Improved quickstart docs
syrusakbary Jul 24, 2017
7ca5c22
Added create_type. Support for Meta as dict
syrusakbary Jul 25, 2017
ed4bcce
Improved Relay Mutation
syrusakbary Jul 25, 2017
eabb9b2
Added UUID type
syrusakbary Jul 25, 2017
5696c5a
Added UUID docs
syrusakbary Jul 25, 2017
e71b59a
Fixed flake8 issues in mutation
syrusakbary Jul 25, 2017
c7c6112
Allow types to be abstract
syrusakbary Jul 27, 2017
6dde81e
Improved Mutation warning
syrusakbary Jul 27, 2017
711a096
Update UPGRADE-v2.0.md
syrusakbary Jul 27, 2017
719acc6
Update UPGRADE-v2.0.md
syrusakbary Jul 27, 2017
f3bdd7d
Improved upgrade example. Fixed #509
syrusakbary Jul 27, 2017
5c58d9e
Fixed lazy type instant resolved with NonNull. Fixed #494
syrusakbary Jul 27, 2017
fa512cf
Improved mutation docs
syrusakbary Jul 27, 2017
a56d5d9
Added union docs. Fixed #493
syrusakbary Jul 27, 2017
e6b0cbb
Merge branch 'master' into 2.0
syrusakbary Jul 27, 2017
6639055
Improved resolver consistency
syrusakbary Jul 27, 2017
6ae9e51
Update UPGRADE-v2.0.md
syrusakbary Jul 27, 2017
586ea56
Update UPGRADE-v2.0.md
syrusakbary Jul 27, 2017
d85a4e4
Update UPGRADE-v2.0.md
syrusakbary Jul 27, 2017
394a1be
Updated resolver api
syrusakbary Jul 27, 2017
0002d42
Updated docs
syrusakbary Jul 27, 2017
6a85507
Improved get_node API
syrusakbary Jul 28, 2017
602d886
Updated graphql-core version
syrusakbary Aug 1, 2017
7f1c2a6
Fixed benchmark tests
syrusakbary Aug 1, 2017
3a83671
Merge branch '2.0' into 2.0-newresolvers
syrusakbary Aug 1, 2017
a4bcb94
Merge pull request #514 from graphql-python/2.0-newresolvers
syrusakbary Aug 1, 2017
8101826
Added support for wheel distributions. Fixed #505
syrusakbary Aug 1, 2017
d8fac58
Fixed source resolver and added tests for it
syrusakbary Aug 1, 2017
10a3e86
Fixed mutation payload name and added tests for covering it.
syrusakbary Aug 1, 2017
7f33fbe
Fixed field source tests
syrusakbary Aug 1, 2017
eff882e
Fixed snapshot
syrusakbary Aug 2, 2017
7e901f8
Improved test coverage
syrusakbary Aug 2, 2017
0a97dea
Improved relay coverage
syrusakbary Aug 2, 2017
8826d72
minor spelling and grammar changes UPGRADE-v2.0.md
Aug 3, 2017
066e7ba
Merge pull request #517 from picturedots/patch-1
syrusakbary Aug 4, 2017
4875404
Update UPGRADE-v2.0.md
syrusakbary Aug 7, 2017
1e20e2b
Update UPGRADE-v2.0.md
syrusakbary Aug 7, 2017
19bf9b3
Update UPGRADE-v2.0.md
syrusakbary Aug 7, 2017
7cfec55
Added mypy static checking
syrusakbary Aug 8, 2017
4585469
Fixed travis
syrusakbary Aug 8, 2017
7eb3ab5
Fixed Flake8 issues
syrusakbary Aug 8, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ target/
# Databases
*.sqlite3
.vscode
.mypy_cache
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
- pypy
before_install:
- |
Expand All @@ -26,13 +26,19 @@ install:
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
Expand All @@ -51,10 +57,13 @@ matrix:
include:
- python: '2.7'
env: TEST_TYPE=lint
- python: '3.6'
env: TEST_TYPE=mypy
deploy:
provider: pypi
user: syrusakbary
on:
tags: true
password:
secure: LHOp9DvYR+70vj4YVY8+JRNCKUOfYZREEUY3+4lMUpY7Zy5QwDfgEMXG64ybREH9dFldpUqVXRj53eeU3spfudSfh8NHkgqW7qihez2AhSnRc4dK6ooNfB+kLcSoJ4nUFGxdYImABc4V1hJvflGaUkTwDNYVxJF938bPaO797IvSbuI86llwqkvuK2Vegv9q/fy9sVGaF9VZIs4JgXwR5AyDR7FBArl+S84vWww4vTFD33hoE88VR4QvFY3/71BwRtQrnCMm7AOm31P9u29yi3bpzQpiOR2rHsgrsYdm597QzFKVxYwsmf9uAx2bpbSPy2WibunLePIvOFwm8xcfwnz4/J4ONBc5PSFmUytTWpzEnxb0bfUNLuYloIS24V6OZ8BfAhiYZ1AwySeJCQDM4Vk1V8IF6trTtyx5EW/uV9jsHCZ3LFsAD7UnFRTosIgN3SAK3ZWCEk5oF2IvjecsolEfkRXB3q9EjMkkuXRUeFDH2lWJLgNE27BzY6myvZVzPmfwZUsPBlPD/6w+WLSp97Rjgr9zS3T1d4ddqFM4ZYu04f2i7a/UUQqG+itzzuX5DWLPvzuNt37JB45mB9IsvxPyXZ6SkAcLl48NGyKok1f3vQnvphkfkl4lni29woKhaau8xlsuEDrcwOoeAsVcZXiItg+l+z2SlIwM0A06EvQ=
distributions: "sdist bdist_wheel"
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Please read [UPGRADE-v1.0.md](/UPGRADE-v1.0.md) to learn how to upgrade to Graphene `1.0`.
Please read [UPGRADE-v2.0.md](/UPGRADE-v2.0.md) to learn how to upgrade to Graphene `2.0`.

---

Expand Down Expand Up @@ -32,12 +32,12 @@ Also, Graphene is fully compatible with the GraphQL spec, working seamlessly wit
For instaling graphene, just run this command in your shell

```bash
pip install "graphene>=1.0"
pip install "graphene>=2.0.dev"
```

## 1.0 Upgrade Guide
## 2.0 Upgrade Guide

Please read [UPGRADE-v1.0.md](/UPGRADE-v1.0.md) to learn how to upgrade.
Please read [UPGRADE-v2.0.md](/UPGRADE-v2.0.md) to learn how to upgrade.


## Examples
Expand All @@ -48,7 +48,7 @@ Here is one example for you to get started:
class Query(graphene.ObjectType):
hello = graphene.String(description='A typical hello world')

def resolve_hello(self, args, context, info):
def resolve_hello(self, info):
return 'World'

schema = graphene.Schema(query=Query)
Expand Down
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Please read `UPGRADE-v1.0.md </UPGRADE-v1.0.md>`__ to learn how to
upgrade to Graphene ``1.0``.
Please read `UPGRADE-v2.0.md </UPGRADE-v2.0.md>`__ to learn how to
upgrade to Graphene ``2.0``.

--------------

Expand All @@ -11,7 +11,7 @@ building GraphQL schemas/types fast and easily.

- **Easy to use:** Graphene helps you use GraphQL in Python without
effort.
- **Relay:** Graphene has builtin support for both Relay.
- **Relay:** Graphene has builtin support for Relay.
- **Data agnostic:** Graphene supports any kind of data source: SQL
(Django, SQLAlchemy), NoSQL, custom Python objects, etc. We believe
that by providing a complete API you could plug Graphene anywhere
Expand Down Expand Up @@ -47,12 +47,12 @@ For instaling graphene, just run this command in your shell

.. code:: bash

pip install "graphene>=1.0"
pip install "graphene>=2.0"

1.0 Upgrade Guide
2.0 Upgrade Guide
-----------------

Please read `UPGRADE-v1.0.md </UPGRADE-v1.0.md>`__ to learn how to
Please read `UPGRADE-v2.0.md </UPGRADE-v2.0.md>`__ to learn how to
upgrade.

Examples
Expand All @@ -65,7 +65,7 @@ Here is one example for you to get started:
class Query(graphene.ObjectType):
hello = graphene.String(description='A typical hello world')

def resolve_hello(self, args, context, info):
def resolve_hello(self, info):
return 'World'

schema = graphene.Schema(query=Query)
Expand Down
Loading