Skip to content

Commit 91412fa

Browse files
committed
ran make upgrade and removed django 4.2 references
1 parent 679dd1f commit 91412fa

14 files changed

Lines changed: 207 additions & 211 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
matrix:
1616
os: [ubuntu-latest]
1717
python-version: ['3.11', '3.12']
18-
toxenv: [quality, docs, django42, django52]
18+
toxenv: [quality, docs, django52]
1919

2020
steps:
2121
- uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
3636
run: tox
3737

3838
- name: Run coverage
39-
if: matrix.python-version == '3.12' && matrix.toxenv == 'django42'
39+
if: matrix.python-version == '3.12' && matrix.toxenv == 'django52'
4040
uses: codecov/codecov-action@v4
4141
with:
4242
token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Change Log
1414
Unreleased
1515
~~~~~~~~~~
1616

17+
* Dropped Django 4.2 support; bumped celery 5.5→5.6.2, jsonfield 3.1→3.2, pip to 26.0.1; loosened Django constraint to <6.0
18+
1719
[1.4.0] - 2024-03-31
1820
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1921
* Added django5.2 support. Adding new migration with index_together change.

requirements/base.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,52 +6,56 @@
66
#
77
amqp==5.3.1
88
# via kombu
9-
asgiref==3.8.1
9+
asgiref==3.11.1
1010
# via django
11-
billiard==4.2.1
11+
billiard==4.2.4
1212
# via celery
13-
celery==5.5.1
13+
celery==5.6.2
1414
# via
1515
# -c requirements/constraints.txt
1616
# -r requirements/base.in
17-
click==8.1.8
17+
click==8.3.1
1818
# via
1919
# celery
2020
# click-didyoumean
2121
# click-plugins
2222
# click-repl
2323
click-didyoumean==0.3.1
2424
# via celery
25-
click-plugins==1.1.1
25+
click-plugins==1.1.1.2
2626
# via celery
2727
click-repl==0.3.0
2828
# via celery
29-
django==4.2.20
29+
django==5.2.12
3030
# via
3131
# -c requirements/common_constraints.txt
3232
# -r requirements/base.in
3333
# django-model-utils
3434
# jsonfield
3535
django-model-utils==5.0.0
3636
# via -r requirements/base.in
37-
jsonfield==3.1.0
37+
jsonfield==3.2.0
3838
# via -r requirements/base.in
39-
kombu==5.5.3
39+
kombu==5.6.2
4040
# via celery
41-
prompt-toolkit==3.0.51
41+
packaging==26.0
42+
# via kombu
43+
prompt-toolkit==3.0.52
4244
# via click-repl
4345
python-dateutil==2.9.0.post0
4446
# via celery
4547
six==1.17.0
4648
# via python-dateutil
47-
sqlparse==0.5.3
49+
sqlparse==0.5.5
4850
# via django
49-
tzdata==2025.2
51+
tzdata==2025.3
5052
# via kombu
53+
tzlocal==5.3.1
54+
# via celery
5155
vine==5.1.0
5256
# via
5357
# amqp
5458
# celery
5559
# kombu
56-
wcwidth==0.2.13
60+
wcwidth==0.6.0
5761
# via prompt-toolkit

requirements/celery50.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
amqp==5.3.1
2-
billiard==4.2.1
3-
celery==5.5.1
4-
click==8.1.8
2+
billiard==4.2.4
3+
celery==5.6.2
4+
click==8.3.1
55
click-didyoumean==0.3.1
66
click-repl==0.3.0
7-
kombu==5.5.3
8-
prompt-toolkit==3.0.51
7+
kombu==5.6.2
8+
prompt-toolkit==3.0.52
99
vine==5.1.0

requirements/ci.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,35 @@
44
#
55
# make upgrade
66
#
7-
cachetools==5.5.2
8-
# via tox
9-
chardet==5.2.0
7+
cachetools==7.0.5
108
# via tox
119
colorama==0.4.6
1210
# via tox
13-
distlib==0.3.9
11+
distlib==0.4.0
1412
# via virtualenv
15-
filelock==3.18.0
13+
filelock==3.25.2
1614
# via
15+
# python-discovery
1716
# tox
1817
# virtualenv
19-
packaging==25.0
18+
packaging==26.0
2019
# via
2120
# pyproject-api
2221
# tox
23-
platformdirs==4.3.7
22+
platformdirs==4.9.4
2423
# via
24+
# python-discovery
2525
# tox
2626
# virtualenv
27-
pluggy==1.5.0
27+
pluggy==1.6.0
28+
# via tox
29+
pyproject-api==1.10.0
2830
# via tox
29-
pyproject-api==1.9.0
31+
python-discovery==1.2.0
32+
# via virtualenv
33+
tomli-w==1.2.0
3034
# via tox
31-
tox==4.25.0
35+
tox==4.50.3
3236
# via -r requirements/ci.in
33-
virtualenv==20.30.0
37+
virtualenv==21.2.0
3438
# via tox

requirements/common_constraints.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,9 @@
1212
# this file from Github directly. It does not require packaging in edx-lint.
1313

1414
# using LTS django version
15-
Django<5.0
15+
Django<6.0
1616

1717
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
1818
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
1919
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2020
elasticsearch<7.14.0
21-
22-
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
23-
django-simple-history==3.0.0
24-
25-
# Cause: https://github.com/openedx/edx-lint/issues/458
26-
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
27-
pip<24.3
28-
29-
# Cause: https://github.com/openedx/edx-lint/issues/475
30-
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
31-
urllib3<2.3.0

0 commit comments

Comments
 (0)