Skip to content

Commit e26e7fe

Browse files
wongchtkiendang
andauthored
Backport Python 3.11 and Django 4.2 in v2 (#1456)
* bump to support py3.11 dj4.2 * Update tox.ini django42 <43 Co-authored-by: Kien Dang <kiend@pm.me> * Apply suggestions from code review master to main Co-authored-by: Kien Dang <kiend@pm.me> * Update tox.ini Co-authored-by: wongcht <wongchunhong.work@gmail.com> --------- Co-authored-by: Kien Dang <kiend@pm.me>
1 parent f386251 commit e26e7fe

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v3
14-
- name: Set up Python 3.10
14+
- name: Set up Python 3.11
1515
uses: actions/setup-python@v4
1616
with:
17-
python-version: "3.10"
17+
python-version: "3.11"
1818
- name: Build wheel and source tarball
1919
run: |
2020
pip install wheel

.github/workflows/lint.yml

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

99
steps:
1010
- uses: actions/checkout@v3
11-
- name: Set up Python 3.10
11+
- name: Set up Python 3.11
1212
uses: actions/setup-python@v4
1313
with:
14-
python-version: "3.10"
14+
python-version: "3.11"
1515
- name: Install dependencies
1616
run: |
1717
python -m pip install --upgrade pip

.github/workflows/tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
max-parallel: 4
1010
matrix:
11-
django: ["2.2", "3.0", "3.1", "3.2", "4.0", "4.1"]
11+
django: ["2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2"]
1212
python-version: ["3.8", "3.9"]
1313
include:
1414
- django: "2.2"
@@ -25,6 +25,12 @@ jobs:
2525
python-version: "3.10"
2626
- django: "4.1"
2727
python-version: "3.10"
28+
- django: "4.1"
29+
python-version: "3.11"
30+
- django: "4.2"
31+
python-version: "3.10"
32+
- django: "4.2"
33+
python-version: "3.11"
2834
steps:
2935
- uses: actions/checkout@v3
3036
- name: Set up Python ${{ matrix.python-version }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
default_language_version:
2-
python: python3.10
2+
python: python3.11
33

44
repos:
55
- repo: https://github.com/PyCQA/flake8

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@
5050
"Programming Language :: Python :: 3.8",
5151
"Programming Language :: Python :: 3.9",
5252
"Programming Language :: Python :: 3.10",
53+
"Programming Language :: Python :: 3.11",
5354
"Programming Language :: Python :: Implementation :: PyPy",
5455
"Framework :: Django",
5556
"Framework :: Django :: 2.2",
5657
"Framework :: Django :: 3.0",
5758
"Framework :: Django :: 3.1",
5859
"Framework :: Django :: 3.2",
5960
"Framework :: Django :: 4.0",
61+
"Framework :: Django :: 4.1",
62+
"Framework :: Django :: 4.2",
6063
],
6164
keywords="api graphql protocol rest relay graphene",
6265
packages=find_packages(exclude=["tests", "examples", "examples.*"]),

tox.ini

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ envlist =
33
py{37,38,39}-django22,
44
py{37,38,39}-django{30,31},
55
py{37,38,39,310}-django32,
6-
py{38,39,310}-django{40,41,master},
6+
py{38,39,310}-django40,
7+
py{38,39,310,311}-django{41,42},
8+
py{310,311}-djangomain,
79
black,flake8
810

911
[gh-actions]
@@ -12,6 +14,7 @@ python =
1214
3.8: py38
1315
3.9: py39
1416
3.10: py310
17+
3.11: py311
1518

1619
[gh-actions:env]
1720
DJANGO =
@@ -21,7 +24,8 @@ DJANGO =
2124
3.2: django32
2225
4.0: django40
2326
4.1: django41
24-
master: djangomaster
27+
4.2: django42
28+
main: djangomain
2529

2630
[testenv]
2731
passenv = *
@@ -38,11 +42,12 @@ deps =
3842
django32: Django>=3.2,<4.0
3943
django40: Django>=4.0,<4.1
4044
django41: Django>=4.1.3,<4.2
41-
djangomaster: https://github.com/django/django/archive/master.zip
45+
django42: Django>=4.2,<4.3
46+
djangomain: https://github.com/django/django/archive/main.zip
4247
commands = {posargs:py.test --cov=graphene_django graphene_django examples}
4348

4449
[testenv:pre-commit]
45-
basepython = python3.10
50+
basepython = python3.11
4651
skip_install = true
4752
deps = pre-commit
4853
commands =

0 commit comments

Comments
 (0)