Skip to content

Commit dc812fe

Browse files
jkimbojkimbo
authored
Merge branch 'master' into next/master
2 parents 67c4310 + 0808e8a commit dc812fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1285
-439
lines changed

‎.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ __pycache__/
1111
# Distribution / packaging
1212
.Python
1313
env/
14+
venv/
15+
.venv/
1416
build/
1517
develop-eggs/
1618
dist/

‎.travis.yml

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,41 @@
11
language: python
2-
matrix:
3-
include:
4-
- env: TOXENV=py36
5-
python: 3.6
6-
- env: TOXENV=py37
7-
python: 3.7
8-
dist: xenial
9-
sudo: true
10-
- env: TOXENV=pre-commit
11-
python: 3.6
12-
- env: TOXENV=mypy
13-
python: 3.6
2+
dist: xenial
3+
4+
python:
5+
- "3.6"
6+
- "3.7"
7+
148
install:
15-
- pip install coveralls tox
9+
- pip install tox tox-travis
1610
script: tox
17-
after_success: coveralls
11+
after_success:
12+
- pip install coveralls
13+
- coveralls
1814
cache:
1915
directories:
2016
- $HOME/.cache/pip
2117
- $HOME/.cache/pre-commit
22-
deploy:
23-
provider: pypi
24-
user: syrusakbary
25-
on:
26-
tags: true
27-
password:
28-
secure: LHOp9DvYR+70vj4YVY8+JRNCKUOfYZREEUY3+4lMUpY7Zy5QwDfgEMXG64ybREH9dFldpUqVXRj53eeU3spfudSfh8NHkgqW7qihez2AhSnRc4dK6ooNfB+kLcSoJ4nUFGxdYImABc4V1hJvflGaUkTwDNYVxJF938bPaO797IvSbuI86llwqkvuK2Vegv9q/fy9sVGaF9VZIs4JgXwR5AyDR7FBArl+S84vWww4vTFD33hoE88VR4QvFY3/71BwRtQrnCMm7AOm31P9u29yi3bpzQpiOR2rHsgrsYdm597QzFKVxYwsmf9uAx2bpbSPy2WibunLePIvOFwm8xcfwnz4/J4ONBc5PSFmUytTWpzEnxb0bfUNLuYloIS24V6OZ8BfAhiYZ1AwySeJCQDM4Vk1V8IF6trTtyx5EW/uV9jsHCZ3LFsAD7UnFRTosIgN3SAK3ZWCEk5oF2IvjecsolEfkRXB3q9EjMkkuXRUeFDH2lWJLgNE27BzY6myvZVzPmfwZUsPBlPD/6w+WLSp97Rjgr9zS3T1d4ddqFM4ZYu04f2i7a/UUQqG+itzzuX5DWLPvzuNt37JB45mB9IsvxPyXZ6SkAcLl48NGyKok1f3vQnvphkfkl4lni29woKhaau8xlsuEDrcwOoeAsVcZXiItg+l+z2SlIwM0A06EvQ=
29-
distributions: "sdist bdist_wheel"
18+
19+
stages:
20+
- test
21+
- name: deploy
22+
if: tag IS present
23+
24+
jobs:
25+
fast_finish: true
26+
include:
27+
- env: TOXENV=pre-commit
28+
python: 3.7
29+
- env: TOXENV=mypy
30+
python: 3.7
31+
- stage: deploy
32+
python: 3.7
33+
after_success: true
34+
deploy:
35+
provider: pypi
36+
user: syrusakbary
37+
on:
38+
tags: true
39+
password:
40+
secure: LHOp9DvYR+70vj4YVY8+JRNCKUOfYZREEUY3+4lMUpY7Zy5QwDfgEMXG64ybREH9dFldpUqVXRj53eeU3spfudSfh8NHkgqW7qihez2AhSnRc4dK6ooNfB+kLcSoJ4nUFGxdYImABc4V1hJvflGaUkTwDNYVxJF938bPaO797IvSbuI86llwqkvuK2Vegv9q/fy9sVGaF9VZIs4JgXwR5AyDR7FBArl+S84vWww4vTFD33hoE88VR4QvFY3/71BwRtQrnCMm7AOm31P9u29yi3bpzQpiOR2rHsgrsYdm597QzFKVxYwsmf9uAx2bpbSPy2WibunLePIvOFwm8xcfwnz4/J4ONBc5PSFmUytTWpzEnxb0bfUNLuYloIS24V6OZ8BfAhiYZ1AwySeJCQDM4Vk1V8IF6trTtyx5EW/uV9jsHCZ3LFsAD7UnFRTosIgN3SAK3ZWCEk5oF2IvjecsolEfkRXB3q9EjMkkuXRUeFDH2lWJLgNE27BzY6myvZVzPmfwZUsPBlPD/6w+WLSp97Rjgr9zS3T1d4ddqFM4ZYu04f2i7a/UUQqG+itzzuX5DWLPvzuNt37JB45mB9IsvxPyXZ6SkAcLl48NGyKok1f3vQnvphkfkl4lni29woKhaau8xlsuEDrcwOoeAsVcZXiItg+l+z2SlIwM0A06EvQ=
41+
distributions: "sdist bdist_wheel"

‎BACKERS.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
/ @syrusakbary @ekampf @dan98765 @projectcheshire
1+
* @ekampf @dan98765 @projectcheshire @jkimbo
22
/docs/ @dvndrsn @phalt @changeling
33
/examples/ @dvndrsn @phalt @changeling

‎Makefile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ help:
33
@echo "Please use \`make <target>' where <target> is one of"
44
@grep -E '^\.PHONY: [a-zA-Z_-]+ .*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = "(: |##)"}; {printf "\033[36m%-30s\033[0m %s\n", $$2, $$3}'
55

6+
.PHONY: install-dev ## Install development dependencies
7+
install-dev:
8+
pip install -e ".[test]"
9+
10+
test:
11+
py.test graphene
12+
613
.PHONY: docs ## Generate docs
7-
docs:
8-
@cd docs &&\
9-
pip install -r requirements.txt &&\
10-
make html &&\
11-
cd -
14+
docs: install-dev
15+
cd docs && make install && make html
16+
17+
.PHONY: docs-live ## Generate docs with live reloading
18+
docs-live: install-dev
19+
cd docs && make install && make livehtml

‎README.md

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4,73 +4,6 @@
44

55
# ![Graphene Logo](http://graphene-python.org/favicon.png) [Graphene](http://graphene-python.org) [![Build Status](https://travis-ci.org/graphql-python/graphene.svg?branch=master)](https://travis-ci.org/graphql-python/graphene) [![PyPI version](https://badge.fury.io/py/graphene.svg)](https://badge.fury.io/py/graphene) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene?branch=master)
66

7-
<h1 align="center">Supporting Graphene Python</h1>
8-
9-
Graphene is an MIT-licensed open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome [backers](https://github.com/graphql-python/graphene/blob/master/BACKERS.md). If you'd like to join them, please consider:
10-
11-
- [Become a backer or sponsor on Patreon](https://www.patreon.com/syrusakbary).
12-
- [One-time donation via PayPal.](https://graphene-python.org/support-graphene/)
13-
14-
<!--<h2 align="center">Special Sponsors</h2>
15-
16-
17-
<p align="center">
18-
<a href="https://stdlib.com" target="_blank">
19-
<img width="260px" src="https://raw.githubusercontent.com/graphql-python/graphene-python.org/master/src/pages/sponsors/generic-logo.png">
20-
</a>
21-
</p>
22-
23-
<!--special end-->
24-
25-
<h2 align="center">Platinum via Patreon</h2>
26-
27-
<!--platinum start-->
28-
<table>
29-
<tbody>
30-
<tr>
31-
<td align="center" valign="middle">
32-
<a href="https://www.patreon.com/join/syrusakbary" target="_blank">
33-
<img width="222px" src="https://raw.githubusercontent.com/graphql-python/graphene-python.org/master/src/pages/sponsors/generic-logo.png">
34-
</a>
35-
</td>
36-
</tr>
37-
</tbody>
38-
</table>
39-
40-
<h2 align="center">Gold via Patreon</h2>
41-
42-
<!--gold start-->
43-
<table>
44-
<tbody>
45-
<tr>
46-
<td align="center" valign="middle">
47-
<a href="https://www.patreon.com/join/syrusakbary" target="_blank">
48-
<img width="148px" src="https://raw.githubusercontent.com/graphql-python/graphene-python.org/master/src/pages/sponsors/generic-logo.png">
49-
</a>
50-
</td>
51-
</tr>
52-
</tbody>
53-
</table>
54-
<!--gold end-->
55-
56-
<h2 align="center">Silver via Patreon</h2>
57-
58-
<!--silver start-->
59-
<table>
60-
<tbody>
61-
<tr>
62-
<td align="center" valign="middle">
63-
<a href="https://www.patreon.com/join/syrusakbary" target="_blank">
64-
<img width="148px" src="https://raw.githubusercontent.com/graphql-python/graphene-python.org/master/src/pages/sponsors/generic-logo.png">
65-
</a>
66-
</td>
67-
</tr>
68-
</tbody>
69-
</table>
70-
<!--silver end-->
71-
72-
---
73-
747
## Introduction
758

769
[Graphene](http://graphene-python.org) is a Python library for building GraphQL schemas/types fast and easily.

‎ROADMAP.md

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,54 @@
1-
# Graphene Roadmap
1+
# GraphQL Python Roadmap
22

3-
In order to move Graphene and the GraphQL Python ecosystem forward I realized is essential to be clear with the community on next steps, so we can move uniformly.
4-
5-
There are few key points that need to happen in the short/mid term, divided into two main sections:
6-
7-
- [Community](#community)
8-
- [Graphene 3](#graphene-3)
3+
In order to move Graphene and the GraphQL Python ecosystem forward it's essential to be clear with the community on next steps, so we can move uniformly.
94

105
_👋 If you have more ideas on how to move the Graphene ecosystem forward, don't hesistate to [open a PR](https://github.com/graphql-python/graphene/edit/master/ROADMAP.md)_
116

12-
## Community
13-
14-
The goal is to improve adoption and sustainability of the project.
15-
16-
- 💎 Add Commercial Support for Graphene - [See issue](https://github.com/graphql-python/graphene/issues/813)
17-
- Create [Patreon page](https://www.patreon.com/syrusakbary)
18-
- Add [/support-graphene page](https://graphene-python.org/support-graphene/) in Graphene website
19-
- 📘 Vastly improve documentation - [See issue](https://github.com/graphql-python/graphene/issues/823)
20-
- ~~💰 Apply for [Mozilla MOSS](https://www.mozilla.org/en-US/moss/) sponsorship~~ (not for now)
21-
22-
## Graphene 3
23-
24-
The goal is to summarize the different improvements that Graphene will need to accomplish for version 3.
25-
26-
In a nushell, Graphene 3 should take the Python 3 integration one step forward while still maintaining compatibility with Python 2.
277

28-
- 🚀 [graphql-core-next](https://github.com/graphql-python/graphql-core-next) GraphQL engine support (almost same API as graphql-core)
29-
- 🔸 GraphQL types from type annotations - [See issue](https://github.com/graphql-python/graphene/issues/729)
30-
- 📄 Schema creation from SDL (API TBD)
31-
- ✨ Improve connections structure
32-
- 📗 Improve function documentation
33-
- 🔀 Add support for coroutines in Connection, Mutation (abstracting out Promise requirement) - [See PR](https://github.com/graphql-python/graphene/pull/824)
8+
## Now
9+
- [ ] Continue to support v2.x with security releases
10+
- [ ] Last major/feature release is cut and graphene-* libraries should pin to that version number
11+
12+
## Next
13+
New features will only be developed on version 3 of ecosystem libraries.
14+
15+
### [Core-Next](https://github.com/graphql-python/graphql-core-next)
16+
Targeted as v3 of [graphql-core](https://pypi.org/project/graphql-core/), Python 3 only
17+
18+
### Graphene
19+
- [ ] Integrate with the core-next API and resolve all breaking changes
20+
- [ ] GraphQL types from type annotations - [See issue](https://github.com/graphql-python/graphene/issues/729)
21+
- [ ] Add support for coroutines in Connection, Mutation (abstracting out Promise requirement) - [See PR](https://github.com/graphql-python/graphene/pull/824)
22+
23+
### Graphene-*
24+
- [ ] Integrate with the graphene core-next API and resolve all breaking changes
25+
26+
### *-graphql
27+
- [ ] Integrate with the graphql core-next API and resolve all breaking changes
28+
29+
## Ongoing Initiatives
30+
- [ ] Improve documentation, especially for new users to the library
31+
- [ ] Recipes for “quick start” that people can ideally use/run
32+
33+
34+
## Dependent Libraries
35+
| Repo | Release Manager | CODEOWNERS | Pinned | next/master created | Labels Standardized |
36+
| ---------------------------------------------------------------------------- | --------------- | ---------- | ---------- | ------------------- | ------------------- |
37+
| [graphene](https://github.com/graphql-python/graphene) | ekampf | ✅ | | ✅ | |
38+
| [graphql-core](https://github.com/graphql-python/graphql-core) | Cito | ✅ | N/A | N/A | |
39+
| [graphql-core-next](https://github.com/graphql-python/graphql-core-next) | Cito | ✅ | N/A | N/A | |
40+
| [graphql-server-core](https://github.com/graphql-python/graphql-server-core) | Cito | | ✅ | ✅ | |
41+
| [gql](https://github.com/graphql-python/gql) | ekampf | | | | |
42+
| [gql-next](https://github.com/graphql-python/gql-next) | ekampf | | N/A | N/A | |
43+
| ...[aiohttp](https://github.com/graphql-python/aiohttp-graphql) | | | | | |
44+
| ...[django](https://github.com/graphql-python/graphene-django) | mvanlonden | | ✅ | ✅ | |
45+
| ...[sanic](https://github.com/graphql-python/sanic-graphql) | ekampf | | | | |
46+
| ...[flask](https://github.com/graphql-python/flask-graphql) | | | | | |
47+
| ...[webob](https://github.com/graphql-python/webob-graphql) | | | | | |
48+
| ...[tornado](https://github.com/graphql-python/graphene-tornado) | ewhauser | | PR created | ✅ | |
49+
| ...[ws](https://github.com/graphql-python/graphql-ws) | Cito/dfee | | ✅ | ✅ | |
50+
| ...[gae](https://github.com/graphql-python/graphene-gae) | ekampf | | PR created | ✅ | |
51+
| ...[sqlalchemy](https://github.com/graphql-python/graphene-sqlalchemy) | jnak/Nabell | ✅ | ✅ | ✅ | |
52+
| ...[mongo](https://github.com/graphql-python/graphene-mongo) | | | ✅ | ✅ | |
53+
| ...[relay-py](https://github.com/graphql-python/graphql-relay-py) | Cito | | | | |
54+
| ...[wsgi](https://github.com/moritzmhmk/wsgi-graphql) | | | | | |

0 commit comments

Comments
 (0)