Skip to content

Commit 8e1c3d3

Browse files
erikwredeerikwrede
authored
Merge branch 'master' into update-dataloaderdocs
2 parents 13c6613 + 80e3498 commit 8e1c3d3

File tree

103 files changed

+2355
-641
lines changed

Some content is hidden

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

103 files changed

+2355
-641
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: "\U0001F41B bug"
6+
assignees: ''
7+
8+
---
9+
10+
**Note: for support questions, please use stackoverflow**. This repository's issues are reserved for feature requests and bug reports.
11+
12+
* **What is the current behavior?**
13+
14+
15+
16+
* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem** via
17+
a github repo, https://repl.it or similar.
18+
19+
20+
21+
* **What is the expected behavior?**
22+
23+
24+
25+
* **What is the motivation / use case for changing the behavior?**
26+
27+
28+
29+
* **Please tell us about your environment:**
30+
31+
- Version:
32+
- Platform:
33+
34+
* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow)

‎.github/ISSUE_TEMPLATE/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: "✨ enhancement"
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/stale.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 90
2+
daysUntilStale: false
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 14
4+
daysUntilClose: false
55
# Issues with these labels will never be considered stale
66
exemptLabels:
77
- pinned
@@ -15,9 +15,10 @@ exemptLabels:
1515
# Label to use when marking an issue as stale
1616
staleLabel: wontfix
1717
# Comment to post when marking an issue as stale. Set to `false` to disable
18-
markComment: >
19-
This issue has been automatically marked as stale because it has not had
20-
recent activity. It will be closed if no further activity occurs. Thank you
21-
for your contributions.
18+
markComment: false
19+
# markComment: >
20+
# This issue has been automatically marked as stale because it has not had
21+
# recent activity. It will be closed if no further activity occurs. Thank you
22+
# for your contributions.
2223
# Comment to post when closing a stale issue. Set to `false` to disable
2324
closeComment: false

‎.github/workflows/coveralls.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 📊 Check Coverage
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- '*.x'
7+
paths-ignore:
8+
- 'docs/**'
9+
- '*.md'
10+
- '*.rst'
11+
pull_request:
12+
branches:
13+
- master
14+
- '*.x'
15+
paths-ignore:
16+
- 'docs/**'
17+
- '*.md'
18+
- '*.rst'
19+
jobs:
20+
coveralls_finish:
21+
# check coverage increase/decrease
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Coveralls Finished
25+
uses: AndreMiras/coveralls-python-action@develop

‎.github/workflows/deploy.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: 🚀 Deploy to PyPI
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up Python 3.9
15+
uses: actions/setup-python@v2
16+
with:
17+
python-version: 3.9
18+
- name: Build wheel and source tarball
19+
run: |
20+
pip install wheel
21+
python setup.py sdist bdist_wheel
22+
- name: Publish a Python distribution to PyPI
23+
uses: pypa/[email protected]
24+
with:
25+
user: __token__
26+
password: ${{ secrets.pypi_password }}

‎.github/workflows/lint.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: 💅 Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Set up Python 3.9
12+
uses: actions/setup-python@v2
13+
with:
14+
python-version: 3.9
15+
- name: Install dependencies
16+
run: |
17+
python -m pip install --upgrade pip
18+
pip install tox
19+
- name: Run lint
20+
run: tox
21+
env:
22+
TOXENV: pre-commit
23+
- name: Run mypy
24+
run: tox
25+
env:
26+
TOXENV: mypy

‎.github/workflows/tests.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: 📄 Tests
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- '*.x'
7+
paths-ignore:
8+
- 'docs/**'
9+
- '*.md'
10+
- '*.rst'
11+
pull_request:
12+
branches:
13+
- master
14+
- '*.x'
15+
paths-ignore:
16+
- 'docs/**'
17+
- '*.md'
18+
- '*.rst'
19+
jobs:
20+
tests:
21+
# runs the test suite
22+
name: ${{ matrix.name }}
23+
runs-on: ${{ matrix.os }}
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
include:
28+
- {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
29+
- {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
30+
- { name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38 }
31+
- { name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37 }
32+
- { name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36 }
33+
steps:
34+
- uses: actions/checkout@v3
35+
- uses: actions/setup-python@v3
36+
with:
37+
python-version: ${{ matrix.python }}
38+
39+
- name: update pip
40+
run: |
41+
pip install -U wheel
42+
pip install -U setuptools
43+
python -m pip install -U pip
44+
45+
- name: get pip cache dir
46+
id: pip-cache
47+
run: echo "::set-output name=dir::$(pip cache dir)"
48+
49+
- name: cache pip dependencies
50+
uses: actions/cache@v3
51+
with:
52+
path: ${{ steps.pip-cache.outputs.dir }}
53+
key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}
54+
55+
- run: pip install tox
56+
- run: tox -e ${{ matrix.tox }}
57+
- name: Upload coverage.xml
58+
if: ${{ matrix.python == '3.10' }}
59+
uses: actions/upload-artifact@v3
60+
with:
61+
name: graphene-sqlalchemy-coverage
62+
path: coverage.xml
63+
if-no-files-found: error
64+
- name: Upload coverage.xml to codecov
65+
if: ${{ matrix.python == '3.10' }}
66+
uses: codecov/codecov-action@v3

‎.pre-commit-config.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
default_language_version:
2+
python: python3.9
3+
14
repos:
2-
- repo: git://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.1.0
5+
- repo: https://github.com/pre-commit/pre-commit-hooks
6+
rev: v4.2.0
47
hooks:
58
- id: check-merge-conflict
69
- id: check-json
@@ -14,15 +17,14 @@ repos:
1417
- id: trailing-whitespace
1518
exclude: README.md
1619
- repo: https://github.com/asottile/pyupgrade
17-
rev: v1.12.0
20+
rev: v2.32.1
1821
hooks:
1922
- id: pyupgrade
2023
- repo: https://github.com/ambv/black
21-
rev: 19.10b0
24+
rev: 22.3.0
2225
hooks:
23-
- id: black
24-
language_version: python3
26+
- id: black
2527
- repo: https://github.com/PyCQA/flake8
26-
rev: 3.7.8
28+
rev: 4.0.1
2729
hooks:
2830
- id: flake8

‎.travis.yml

-42
This file was deleted.

‎CODEOWNERS

-3
This file was deleted.

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ install-dev:
88
pip install -e ".[dev]"
99

1010
test:
11-
py.test graphene examples tests_asyncio
11+
py.test graphene examples
1212

1313
.PHONY: docs ## Generate docs
1414
docs: install-dev
@@ -20,8 +20,8 @@ docs-live: install-dev
2020

2121
.PHONY: format
2222
format:
23-
black graphene examples setup.py tests_asyncio
23+
black graphene examples setup.py
2424

2525
.PHONY: lint
2626
lint:
27-
flake8 graphene examples setup.py tests_asyncio
27+
flake8 graphene examples setup.py

‎README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
**We are looking for contributors**! Please check the [ROADMAP](https://github.com/graphql-python/graphene/blob/master/ROADMAP.md) to see how you can help ❤️
66

7-
---
8-
9-
**The below readme is the documentation for the `dev` (prerelease) version of Graphene. To view the documentation for the latest stable Graphene version go to the [v2 docs](https://docs.graphene-python.org/en/stable/)**
10-
11-
---
12-
137
## Introduction
148

159
[Graphene](http://graphene-python.org) is an opinionated Python library for building GraphQL schemas/types fast and easily.
@@ -37,7 +31,7 @@ Also, Graphene is fully compatible with the GraphQL spec, working seamlessly wit
3731
For instaling graphene, just run this command in your shell
3832

3933
```bash
40-
pip install "graphene>=2.0"
34+
pip install "graphene>=3.0"
4135
```
4236

4337
## Examples

0 commit comments

Comments
 (0)