Skip to content

Commit 69b21ec

Browse files
edx-requirements-botawais786
authored andcommitted
feat: add python 3.12 support
1 parent 0f35c84 commit 69b21ec

File tree

10 files changed

+56
-48
lines changed

10 files changed

+56
-48
lines changed

Diff for: .github/workflows/ci.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-20.04]
16-
python-version: ['3.8']
17-
toxenv: [
18-
django32-celery53-drf313, django32-celery53-drflatest,
19-
django42-celery53-drflatest,
20-
quality, docs
21-
]
16+
python-version:
17+
- '3.8'
18+
- '3.12'
19+
toxenv: [django42-celery53-drflatest, django42-celery53-drflatest,
20+
quality, docs, django42]
2221

2322
steps:
2423
- uses: actions/checkout@v4

Diff for: requirements/base.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ amqp==5.2.0
88
# via kombu
99
asgiref==3.7.2
1010
# via django
11-
backports-zoneinfo[tzdata]==0.2.1
11+
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
1212
# via
13+
# -c requirements/constraints.txt
1314
# celery
1415
# django
1516
# kombu
@@ -31,7 +32,7 @@ click-plugins==1.1.1
3132
# via celery
3233
click-repl==0.3.0
3334
# via celery
34-
django==4.2.10
35+
django==4.2.11
3536
# via
3637
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3738
# -r requirements/base.in
@@ -50,7 +51,7 @@ inflection==0.5.1
5051
# via drf-yasg
5152
kombu==5.3.5
5253
# via celery
53-
packaging==23.2
54+
packaging==24.0
5455
# via drf-yasg
5556
prompt-toolkit==3.0.43
5657
# via click-repl

Diff for: requirements/ci.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ filelock==3.13.1
1616
# via
1717
# tox
1818
# virtualenv
19-
packaging==23.2
19+
packaging==24.0
2020
# via
2121
# pyproject-api
2222
# tox
@@ -32,7 +32,7 @@ tomli==2.0.1
3232
# via
3333
# pyproject-api
3434
# tox
35-
tox==4.13.0
35+
tox==4.14.1
3636
# via -r requirements/ci.in
3737
virtualenv==20.25.1
3838
# via tox

Diff for: requirements/constraints.txt

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@
1313
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1414

1515
celery<6.0
16+
17+
backports.zoneinfo;python_version<"3.9"

Diff for: requirements/dev.txt

+11-9
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ astroid==3.1.0
1717
# -r requirements/quality.txt
1818
# pylint
1919
# pylint-celery
20-
backports-zoneinfo[tzdata]==0.2.1
20+
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
2121
# via
22+
# -c requirements/constraints.txt
2223
# -r requirements/test.txt
2324
# celery
2425
# django
@@ -92,7 +93,7 @@ distlib==0.3.8
9293
# via
9394
# -r requirements/ci.txt
9495
# virtualenv
95-
django==4.2.10
96+
django==4.2.11
9697
# via
9798
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
9899
# -r requirements/test.txt
@@ -123,8 +124,9 @@ filelock==3.13.1
123124
# -r requirements/ci.txt
124125
# tox
125126
# virtualenv
126-
importlib-metadata==7.0.1
127+
importlib-metadata==6.11.0
127128
# via
129+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
128130
# -r requirements/pip-tools.txt
129131
# build
130132
inflection==0.5.1
@@ -159,7 +161,7 @@ mccabe==0.7.0
159161
# pylint
160162
mock==5.1.0
161163
# via -r requirements/test.txt
162-
packaging==23.2
164+
packaging==24.0
163165
# via
164166
# -r requirements/ci.txt
165167
# -r requirements/pip-tools.txt
@@ -175,7 +177,7 @@ pbr==6.0.0
175177
# via
176178
# -r requirements/quality.txt
177179
# stevedore
178-
pip-tools==7.4.0
180+
pip-tools==7.4.1
179181
# via -r requirements/pip-tools.txt
180182
platformdirs==4.2.0
181183
# via
@@ -229,7 +231,7 @@ pyproject-hooks==1.0.0
229231
# -r requirements/pip-tools.txt
230232
# build
231233
# pip-tools
232-
pytest==8.1.0
234+
pytest==8.1.1
233235
# via
234236
# -r requirements/test.txt
235237
# pytest-cov
@@ -302,7 +304,7 @@ tomlkit==0.12.4
302304
# via
303305
# -r requirements/quality.txt
304306
# pylint
305-
tox==4.13.0
307+
tox==4.14.1
306308
# via -r requirements/ci.txt
307309
typing-extensions==4.10.0
308310
# via
@@ -335,11 +337,11 @@ wcwidth==0.2.13
335337
# via
336338
# -r requirements/test.txt
337339
# prompt-toolkit
338-
wheel==0.42.0
340+
wheel==0.43.0
339341
# via
340342
# -r requirements/pip-tools.txt
341343
# pip-tools
342-
zipp==3.17.0
344+
zipp==3.18.0
343345
# via
344346
# -r requirements/pip-tools.txt
345347
# importlib-metadata

Diff for: requirements/doc.txt

+8-6
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ babel==2.14.0
2424
# via
2525
# pydata-sphinx-theme
2626
# sphinx
27-
backports-zoneinfo[tzdata]==0.2.1
27+
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
2828
# via
29+
# -c requirements/constraints.txt
2930
# -r requirements/base.txt
3031
# celery
3132
# django
@@ -75,7 +76,7 @@ cryptography==42.0.5
7576
# via secretstorage
7677
deepmerge==1.1.1
7778
# via sphinxcontrib-openapi
78-
django==4.2.10
79+
django==4.2.11
7980
# via
8081
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
8182
# -r requirements/base.txt
@@ -107,12 +108,13 @@ idna==3.6
107108
# via requests
108109
imagesize==1.4.1
109110
# via sphinx
110-
importlib-metadata==7.0.1
111+
importlib-metadata==6.11.0
111112
# via
113+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
112114
# keyring
113115
# sphinx
114116
# twine
115-
importlib-resources==6.1.2
117+
importlib-resources==6.3.0
116118
# via
117119
# jsonschema
118120
# jsonschema-specifications
@@ -157,7 +159,7 @@ nh3==0.2.15
157159
# via readme-renderer
158160
openapi-codec==1.3.2
159161
# via django-rest-swagger
160-
packaging==23.2
162+
packaging==24.0
161163
# via
162164
# -r requirements/base.txt
163165
# drf-yasg
@@ -310,7 +312,7 @@ wcwidth==0.2.13
310312
# via
311313
# -r requirements/base.txt
312314
# prompt-toolkit
313-
zipp==3.17.0
315+
zipp==3.18.0
314316
# via
315317
# importlib-metadata
316318
# importlib-resources

Diff for: requirements/pip-tools.txt

+8-6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ build==1.1.1
88
# via pip-tools
99
click==8.1.7
1010
# via pip-tools
11-
importlib-metadata==7.0.1
12-
# via build
13-
packaging==23.2
11+
importlib-metadata==6.11.0
12+
# via
13+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
14+
# build
15+
packaging==24.0
1416
# via build
15-
pip-tools==7.4.0
17+
pip-tools==7.4.1
1618
# via -r requirements/pip-tools.in
1719
pyproject-hooks==1.0.0
1820
# via
@@ -23,9 +25,9 @@ tomli==2.0.1
2325
# build
2426
# pip-tools
2527
# pyproject-hooks
26-
wheel==0.42.0
28+
wheel==0.43.0
2729
# via pip-tools
28-
zipp==3.17.0
30+
zipp==3.18.0
2931
# via importlib-metadata
3032

3133
# The following packages are considered to be unsafe in a requirements file:

Diff for: requirements/pip.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
wheel==0.42.0
7+
wheel==0.43.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:

Diff for: requirements/test.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ asgiref==3.7.2
1212
# via
1313
# -r requirements/base.txt
1414
# django
15-
backports-zoneinfo[tzdata]==0.2.1
15+
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
1616
# via
17+
# -c requirements/constraints.txt
1718
# -r requirements/base.txt
1819
# celery
1920
# django
@@ -74,7 +75,7 @@ kombu==5.3.5
7475
# celery
7576
mock==5.1.0
7677
# via -r requirements/test.in
77-
packaging==23.2
78+
packaging==24.0
7879
# via
7980
# -r requirements/base.txt
8081
# -r requirements/test.in
@@ -86,7 +87,7 @@ prompt-toolkit==3.0.43
8687
# via
8788
# -r requirements/base.txt
8889
# click-repl
89-
pytest==8.1.0
90+
pytest==8.1.1
9091
# via
9192
# pytest-cov
9293
# pytest-django

Diff for: tox.ini

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
[tox]
2-
envlist =
3-
py38-django{32,42}-celery{53}-drf{313,latest}
2+
envlist =
3+
py{38,312}-django{42}-celery{53}-drf{313,latest}
44
quality
55
docs
6-
76
[testenv]
8-
deps =
9-
django32: Django>=3.2,<4.0
7+
deps =
108
django42: Django>=4.2,<4.3
11-
drf313: djangorestframework>=3.13,<3.14
129
drflatest: djangorestframework
1310
-r{toxinidir}/requirements/test.txt
14-
commands =
11+
commands =
1512
python -Wd -m pytest --cov user_tasks {posargs}
1613

1714
[testenv:docs]
18-
allowlist_externals =
15+
allowlist_externals =
1916
make
2017
rm
2118
deps =
19+
setuptools
20+
wheel
2221
-r{toxinidir}/requirements/doc.txt
23-
commands =
22+
commands =
2423
doc8 --ignore-path docs/_build --ignore-path docs/rest_api.rst README.rst docs
2524
rm -f docs/user_tasks.rst
2625
rm -f docs/modules.rst
@@ -30,15 +29,15 @@ commands =
3029
twine check dist/*
3130

3231
[testenv:quality]
33-
allowlist_externals =
32+
allowlist_externals =
3433
make
3534
rm
3635
touch
37-
deps =
36+
deps =
3837
-r{toxinidir}/requirements/doc.txt
3938
-r{toxinidir}/requirements/quality.txt
4039
-r{toxinidir}/requirements/test.txt
41-
commands =
40+
commands =
4241
touch tests/__init__.py
4342
pylint user_tasks
4443
pylint tests

0 commit comments

Comments
 (0)