Skip to content

Commit 9aca33c

Browse files
committed
Merge branch 'main' into pickle-schema
2 parents bdd7c3c + 1d8513a commit 9aca33c

File tree

257 files changed

+1642
-2212
lines changed

Some content is hidden

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

257 files changed

+1642
-2212
lines changed

.bandit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# unfortunately, flake8-bandit does not support pyproject.toml
2+
3+
[bandit]
4+
exclude = /tests

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.2.1
2+
current_version = 3.3.0a1
33
commit = False
44
tag = False
55

.coveragerc

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

.flake8

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
# unfortunately, flake8 does not support pyproject.toml
2+
13
[flake8]
24
ignore = E203,W503
35
exclude = .git,.mypy_cache,.pytest_cache,.tox,.venv,__pycache__,build,dist,docs
46
max-line-length = 88
7+
per-file-ignores = tests/*:B011

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111

1212
- name: Set up Python 3.9
13-
uses: actions/setup-python@v2
13+
uses: actions/setup-python@v4
1414
with:
1515
python-version: 3.9
1616

@@ -22,4 +22,4 @@ jobs:
2222
- name: Run code quality tests with tox
2323
run: tox
2424
env:
25-
TOXENV: black,flake8,mypy,docs,manifest
25+
TOXENV: black,flake8,isort,mypy,docs

.github/workflows/publish.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414

1515
- name: Set up Python 3.9
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
1717
with:
1818
python-version: 3.9
1919

2020
- name: Build wheel and source tarball
2121
run: |
22-
pip install wheel
23-
python setup.py sdist bdist_wheel
24-
22+
pip install poetry
23+
poetry build
2524
- name: Publish a Python distribution to PyPI
2625
uses: pypa/gh-action-pypi-publish@release/v1
2726
with:

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88

99
strategy:
1010
matrix:
11-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
11+
python: ['3.7', '3.8', '3.9', '3.10', 'pypy3.9']
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v4
1818
with:
1919
python-version: ${{ matrix.python-version }}
2020

.mypy.ini

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

.pyup.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

MANIFEST.in

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

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ a query language for APIs created by Facebook.
88
[![Documentation Status](https://readthedocs.org/projects/graphql-core-3/badge/)](https://graphql-core-3.readthedocs.io)
99
![Test Status](https://github.com/graphql-python/graphql-core/actions/workflows/test.yml/badge.svg)
1010
![Lint Status](https://github.com/graphql-python/graphql-core/actions/workflows/lint.yml/badge.svg)
11-
[![Dependency Updates](https://pyup.io/repos/github/graphql-python/graphql-core/shield.svg)](https://pyup.io/repos/github/graphql-python/graphql-core/)
12-
[![Python 3 Status](https://pyup.io/repos/github/graphql-python/graphql-core/python-3-shield.svg)](https://pyup.io/repos/github/graphql-python/graphql-core/)
1311
[![Code Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
1412

15-
The current version 3.2.1 of GraphQL-core is up-to-date with GraphQL.js version 16.3.0.
16-
1713
An extensive test suite with over 2300 unit tests and 100% coverage comprises a
1814
replication of the complete test suite of GraphQL.js, making sure this port is
1915
reliable and compatible with GraphQL.js.
2016

21-
Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js. Increases in the major version of GraphQL.js are reflected in the minor version of GraphQL-core instead. This means there can be breaking changes in the API when the minor version changes, and only patch releases are fully backward compatible. Therefore, we recommend something like `=~ 3.2.0` as version specifier when including GraphQL-core as a dependency.
17+
The current stable version 3.2.3 of GraphQL-core is up-to-date with GraphQL.js version 16.6.0.
18+
19+
You can also try out the latest alpha version 3.3.0a1 of GraphQL-core that is up-to-date with GraphQL.js version 17.0.0a1.
20+
Please note that this new minor version of GraphQL-core does not support Python 3.7 anymore.
21+
22+
Note that for various reasons, GraphQL-core does not use SemVer like GraphQL.js. Changes in the major version of GraphQL.js are reflected in the minor version of GraphQL-core instead. This means there can be breaking changes in the API when the minor version changes, and only patch releases are fully backward compatible. Therefore, we recommend something like `=~ 3.2.0` as version specifier when including GraphQL-core as a dependency.
2223

2324

2425
## Documentation
@@ -50,10 +51,10 @@ GraphQL-core 3 can be installed from PyPI using the built-in pip command:
5051

5152
python -m pip install graphql-core
5253

53-
You can also use [pipenv](https://docs.pipenv.org/) for installation in a
54+
You can also use [poetry](https://github.com/python-poetry/poetry) for installation in a
5455
virtual environment:
5556

56-
pipenv install graphql-core
57+
poetry install
5758

5859

5960
## Usage

SECURITY.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| >= 3.2 | :white_check_mark: |
8+
| < 3.2 | :x: |
9+
10+
## Reporting a Vulnerability
11+
12+
You should report any vulnerabilities privately to [Cito](https://github.com/Cito) as the current maintainer of this repository, but note that he is working on the project voluntary in his spare time, so please be patient with him.
13+
14+
Please do not use the public Issue tracker of this repository to disclose security related issues.
15+
16+
Also, please keep in mind that this repository is actually a port of the [GraphQL.js](https://github.com/graphql/graphql-js). Issues that also affect upstream should be also reported there.

docs/conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@
5959
# built documents.
6060
#
6161
# The short X.Y version.
62-
# version = '3.2'
62+
# version = '3.3'
6363
# The full version, including alpha/beta/rc tags.
64-
version = release = '3.2.1'
64+
version = release = '3.3.0a1'
6565

6666
# The language for content autogenerated by Sphinx. Refer to documentation
6767
# for a list of supported languages.
6868
#
6969
# This is also used if you do content translation via gettext catalogs.
7070
# Usually you set "language" from the command line for these cases.
71-
language = None
71+
language = 'en'
7272

7373
# There are two options for replacing |today|: either, you set today to some
7474
# non-false value, then it is used:
@@ -134,6 +134,7 @@
134134
enum.Enum
135135
traceback
136136
types.TracebackType
137+
TypeMap
137138
EnterLeaveVisitor
138139
FormattedSourceLocation
139140
GraphQLAbstractType

docs/intro.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ You can install GraphQL-core 3 using pip_::
3333

3434
pip install graphql-core
3535

36-
You can also install GraphQL-core 3 with pipenv_, if you prefer that::
36+
You can also install GraphQL-core 3 with poetry_, if you prefer that::
3737

38-
pipenv install graphql-core
38+
poetry install
3939

4040
Now you can start using GraphQL-core 3 by importing from the top-level
4141
:mod:`graphql` package. Nearly everything defined in the sub-packages
@@ -94,4 +94,4 @@ in the current development or want to report issues or send pull requests.
9494
.. _Execution: https://facebook.github.io/graphql/draft/#sec-Execution
9595
.. _Response: https://facebook.github.io/graphql/draft/#sec-Response
9696
.. _pip: https://pip.pypa.io/
97-
.. _pipenv: https://github.com/pypa/pipenv
97+
.. _poetry: https://github.com/python-poetry/poetry

docs/modules/utilities.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Get the target Operation from a Document:
1818

1919
.. autofunction:: get_operation_ast
2020

21-
Get the Type for the target Operation AST:
22-
23-
.. autofunction:: get_operation_root_type
24-
2521
Convert a GraphQLSchema to an IntrospectionQuery:
2622

2723
.. autofunction:: introspection_from_schema
@@ -98,11 +94,6 @@ Comparators for types:
9894
.. autofunction:: is_type_sub_type_of
9995
.. autofunction:: do_types_overlap
10096

101-
Assert that a string is a valid GraphQL name:
102-
103-
.. autofunction:: assert_valid_name
104-
.. autofunction:: is_valid_name_error
105-
10697
Compare two GraphQLSchemas and detect breaking changes:
10798

10899
.. autofunction:: find_breaking_changes

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sphinx>=4.3,<5
1+
sphinx>=5.1,<5.2
22
sphinx_rtd_theme>=1,<2

0 commit comments

Comments
 (0)