Skip to content

Commit 34b5742

Browse files
committed
Merge remote-tracking branch 'origin/master' into association_proxy-support
2 parents 70f866b + 32d0d18 commit 34b5742

Some content is hidden

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

42 files changed

+3254
-1227
lines changed

.github/workflows/deploy.yml

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

1212
steps:
13-
- uses: actions/checkout@v2
14-
- name: Set up Python 3.9
15-
uses: actions/setup-python@v2
13+
- uses: actions/checkout@v3
14+
- name: Set up Python 3.10
15+
uses: actions/setup-python@v3
1616
with:
17-
python-version: 3.9
17+
python-version: '3.10'
1818
- name: Build wheel and source tarball
1919
run: |
2020
pip install wheel

.github/workflows/lint.yml

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

99
steps:
10-
- uses: actions/checkout@v2
11-
- name: Set up Python 3.9
12-
uses: actions/setup-python@v2
10+
- uses: actions/checkout@v3
11+
- name: Set up Python 3.10
12+
uses: actions/setup-python@v3
1313
with:
14-
python-version: 3.9
14+
python-version: '3.10'
1515
- name: Install dependencies
1616
run: |
1717
python -m pip install --upgrade pip

.github/workflows/tests.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
name: Tests
22

3-
on: [push, pull_request]
4-
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
pull_request:
8+
branches:
9+
- '*'
510
jobs:
611
test:
712
runs-on: ubuntu-latest
813
strategy:
914
max-parallel: 10
1015
matrix:
1116
sql-alchemy: ["1.2", "1.3", "1.4"]
12-
python-version: ["3.6", "3.7", "3.8", "3.9"]
17+
python-version: ["3.7", "3.8", "3.9", "3.10"]
1318

1419
steps:
15-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
1621
- name: Set up Python ${{ matrix.python-version }}
17-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v3
1823
with:
1924
python-version: ${{ matrix.python-version }}
2025
- name: Install dependencies
@@ -27,12 +32,12 @@ jobs:
2732
SQLALCHEMY: ${{ matrix.sql-alchemy }}
2833
TOXENV: ${{ matrix.toxenv }}
2934
- name: Upload coverage.xml
30-
if: ${{ matrix.sql-alchemy == '1.4' && matrix.python-version == '3.9' }}
31-
uses: actions/upload-artifact@v2
35+
if: ${{ matrix.sql-alchemy == '1.4' && matrix.python-version == '3.10' }}
36+
uses: actions/upload-artifact@v3
3237
with:
3338
name: graphene-sqlalchemy-coverage
3439
path: coverage.xml
3540
if-no-files-found: error
3641
- name: Upload coverage.xml to codecov
37-
if: ${{ matrix.sql-alchemy == '1.4' && matrix.python-version == '3.9' }}
38-
uses: codecov/codecov-action@v1
42+
if: ${{ matrix.sql-alchemy == '1.4' && matrix.python-version == '3.10' }}
43+
uses: codecov/codecov-action@v3

.pre-commit-config.yaml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
default_language_version:
2-
python: python3.7
2+
python: python3.7
33
repos:
4-
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: c8bad492e1b1d65d9126dba3fe3bd49a5a52b9d6 # v2.1.0
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v4.2.0
66
hooks:
7-
- id: check-merge-conflict
8-
- id: check-yaml
9-
- id: debug-statements
10-
- id: end-of-file-fixer
7+
- id: check-merge-conflict
8+
- id: check-yaml
9+
- id: debug-statements
10+
- id: end-of-file-fixer
1111
exclude: ^docs/.*$
12-
- id: trailing-whitespace
12+
- id: trailing-whitespace
1313
exclude: README.md
14-
- repo: https://github.com/PyCQA/flake8
15-
rev: 88caf5ac484f5c09aedc02167c59c66ff0af0068 # 3.7.7
14+
- repo: https://github.com/pycqa/isort
15+
rev: 5.10.1
1616
hooks:
17-
- id: flake8
18-
- repo: https://github.com/asottile/seed-isort-config
19-
rev: v1.7.0
17+
- id: isort
18+
name: isort (python)
19+
- repo: https://github.com/asottile/pyupgrade
20+
rev: v2.37.3
2021
hooks:
21-
- id: seed-isort-config
22-
- repo: https://github.com/pre-commit/mirrors-isort
23-
rev: v4.3.4
22+
- id: pyupgrade
23+
- repo: https://github.com/psf/black
24+
rev: 22.6.0
2425
hooks:
25-
- id: isort
26+
- id: black
27+
- repo: https://github.com/PyCQA/flake8
28+
rev: 4.0.0
29+
hooks:
30+
- id: flake8

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
Please read [UPGRADE-v2.0.md](https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md)
2-
to learn how to upgrade to Graphene `2.0`.
1+
Version 3.0 is in beta stage. Please read https://github.com/graphql-python/graphene-sqlalchemy/issues/348 to learn about progress and changes in upcoming
2+
beta releases.
33

44
---
55

6-
# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-SQLAlchemy [![Build Status](https://travis-ci.org/graphql-python/graphene-sqlalchemy.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-sqlalchemy) [![PyPI version](https://badge.fury.io/py/graphene-sqlalchemy.svg)](https://badge.fury.io/py/graphene-sqlalchemy) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene-sqlalchemy/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene-sqlalchemy?branch=master)
6+
# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-SQLAlchemy
7+
[![Build Status](https://github.com/graphql-python/graphene-sqlalchemy/workflows/Tests/badge.svg)](https://github.com/graphql-python/graphene-sqlalchemy/actions)
8+
[![PyPI version](https://badge.fury.io/py/graphene-sqlalchemy.svg)](https://badge.fury.io/py/graphene-sqlalchemy)
9+
![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/graphql-python/graphene-sqlalchemy?color=green&include_prereleases&label=latest)
10+
[![codecov](https://codecov.io/gh/graphql-python/graphene-sqlalchemy/branch/master/graph/badge.svg?token=Zi5S1TikeN)](https://codecov.io/gh/graphql-python/graphene-sqlalchemy)
11+
712

813

914
A [SQLAlchemy](http://www.sqlalchemy.org/) integration for [Graphene](http://graphene-python.org/).
@@ -13,7 +18,7 @@ A [SQLAlchemy](http://www.sqlalchemy.org/) integration for [Graphene](http://gra
1318
For installing Graphene, just run this command in your shell.
1419

1520
```bash
16-
pip install "graphene-sqlalchemy>=2.0"
21+
pip install "graphene-sqlalchemy>=3"
1722
```
1823

1924
## Examples

docs/conf.py

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import os
22

3-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
3+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
44

55
# -*- coding: utf-8 -*-
66
#
@@ -34,46 +34,46 @@
3434
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
3535
# ones.
3636
extensions = [
37-
'sphinx.ext.autodoc',
38-
'sphinx.ext.intersphinx',
39-
'sphinx.ext.todo',
40-
'sphinx.ext.coverage',
41-
'sphinx.ext.viewcode',
37+
"sphinx.ext.autodoc",
38+
"sphinx.ext.intersphinx",
39+
"sphinx.ext.todo",
40+
"sphinx.ext.coverage",
41+
"sphinx.ext.viewcode",
4242
]
4343
if not on_rtd:
4444
extensions += [
45-
'sphinx.ext.githubpages',
45+
"sphinx.ext.githubpages",
4646
]
4747

4848
# Add any paths that contain templates here, relative to this directory.
49-
templates_path = ['_templates']
49+
templates_path = ["_templates"]
5050

5151
# The suffix(es) of source filenames.
5252
# You can specify multiple suffix as a list of string:
5353
#
5454
# source_suffix = ['.rst', '.md']
55-
source_suffix = '.rst'
55+
source_suffix = ".rst"
5656

5757
# The encoding of source files.
5858
#
5959
# source_encoding = 'utf-8-sig'
6060

6161
# The master toctree document.
62-
master_doc = 'index'
62+
master_doc = "index"
6363

6464
# General information about the project.
65-
project = u'Graphene Django'
66-
copyright = u'Graphene 2016'
67-
author = u'Syrus Akbary'
65+
project = "Graphene Django"
66+
copyright = "Graphene 2016"
67+
author = "Syrus Akbary"
6868

6969
# The version info for the project you're documenting, acts as replacement for
7070
# |version| and |release|, also used in various other places throughout the
7171
# built documents.
7272
#
7373
# The short X.Y version.
74-
version = u'1.0'
74+
version = "1.0"
7575
# The full version, including alpha/beta/rc tags.
76-
release = u'1.0.dev'
76+
release = "1.0.dev"
7777

7878
# The language for content autogenerated by Sphinx. Refer to documentation
7979
# for a list of supported languages.
@@ -94,7 +94,7 @@
9494
# List of patterns, relative to source directory, that match files and
9595
# directories to ignore when looking for source files.
9696
# This patterns also effect to html_static_path and html_extra_path
97-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
97+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
9898

9999
# The reST default role (used for this markup: `text`) to use for all
100100
# documents.
@@ -116,7 +116,7 @@
116116
# show_authors = False
117117

118118
# The name of the Pygments (syntax highlighting) style to use.
119-
pygments_style = 'sphinx'
119+
pygments_style = "sphinx"
120120

121121
# A list of ignored prefixes for module index sorting.
122122
# modindex_common_prefix = []
@@ -175,7 +175,7 @@
175175
# Add any paths that contain custom static files (such as style sheets) here,
176176
# relative to this directory. They are copied after the builtin static files,
177177
# so a file named "default.css" will overwrite the builtin "default.css".
178-
html_static_path = ['_static']
178+
html_static_path = ["_static"]
179179

180180
# Add any extra paths that contain custom files (such as robots.txt or
181181
# .htaccess) here, relative to this directory. These files are copied
@@ -255,34 +255,30 @@
255255
# html_search_scorer = 'scorer.js'
256256

257257
# Output file base name for HTML help builder.
258-
htmlhelp_basename = 'Graphenedoc'
258+
htmlhelp_basename = "Graphenedoc"
259259

260260
# -- Options for LaTeX output ---------------------------------------------
261261

262262
latex_elements = {
263-
# The paper size ('letterpaper' or 'a4paper').
264-
#
265-
# 'papersize': 'letterpaper',
266-
267-
# The font size ('10pt', '11pt' or '12pt').
268-
#
269-
# 'pointsize': '10pt',
270-
271-
# Additional stuff for the LaTeX preamble.
272-
#
273-
# 'preamble': '',
274-
275-
# Latex figure (float) alignment
276-
#
277-
# 'figure_align': 'htbp',
263+
# The paper size ('letterpaper' or 'a4paper').
264+
#
265+
# 'papersize': 'letterpaper',
266+
# The font size ('10pt', '11pt' or '12pt').
267+
#
268+
# 'pointsize': '10pt',
269+
# Additional stuff for the LaTeX preamble.
270+
#
271+
# 'preamble': '',
272+
# Latex figure (float) alignment
273+
#
274+
# 'figure_align': 'htbp',
278275
}
279276

280277
# Grouping the document tree into LaTeX files. List of tuples
281278
# (source start file, target name, title,
282279
# author, documentclass [howto, manual, or own class]).
283280
latex_documents = [
284-
(master_doc, 'Graphene.tex', u'Graphene Documentation',
285-
u'Syrus Akbary', 'manual'),
281+
(master_doc, "Graphene.tex", "Graphene Documentation", "Syrus Akbary", "manual"),
286282
]
287283

288284
# The name of an image file (relative to this directory) to place at the top of
@@ -323,8 +319,7 @@
323319
# One entry per manual page. List of tuples
324320
# (source start file, name, description, authors, manual section).
325321
man_pages = [
326-
(master_doc, 'graphene_django', u'Graphene Django Documentation',
327-
[author], 1)
322+
(master_doc, "graphene_django", "Graphene Django Documentation", [author], 1)
328323
]
329324

330325
# If true, show URL addresses after external links.
@@ -338,9 +333,15 @@
338333
# (source start file, target name, title, author,
339334
# dir menu entry, description, category)
340335
texinfo_documents = [
341-
(master_doc, 'Graphene-Django', u'Graphene Django Documentation',
342-
author, 'Graphene Django', 'One line description of project.',
343-
'Miscellaneous'),
336+
(
337+
master_doc,
338+
"Graphene-Django",
339+
"Graphene Django Documentation",
340+
author,
341+
"Graphene Django",
342+
"One line description of project.",
343+
"Miscellaneous",
344+
),
344345
]
345346

346347
# Documents to append as an appendix to all manuals.
@@ -414,7 +415,7 @@
414415
# epub_post_files = []
415416

416417
# A list of files that should not be packed into the epub file.
417-
epub_exclude_files = ['search.html']
418+
epub_exclude_files = ["search.html"]
418419

419420
# The depth of the table of contents in toc.ncx.
420421
#
@@ -446,4 +447,4 @@
446447

447448

448449
# Example configuration for intersphinx: refer to the Python standard library.
449-
intersphinx_mapping = {'https://docs.python.org/': None}
450+
intersphinx_mapping = {"https://docs.python.org/": None}

0 commit comments

Comments
 (0)