Skip to content

Commit 4169653

Browse files
committed
build: support only Django 4
1 parent 403cf60 commit 4169653

17 files changed

Lines changed: 304 additions & 270 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
os: [ubuntu-latest]
1818
python-version: ['3.12']
19-
toxenv: [quality, data-django42, reporting-django42, data-django52, reporting-django52]
19+
toxenv: [quality, data-django42, reporting-django42]
2020

2121
steps:
2222
- uses: actions/checkout@v4

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ geckodriver/
8181

8282
# pyenv
8383
.python-version
84+
venv/

enterprise_data/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
Enterprise data api application. This Django app exposes API endpoints used by enterprises.
33
"""
44

5-
__version__ = "10.21.16"
5+
__version__ = "10.22.0"

requirements/base.txt

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.12
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# make upgrade
66
#
77
amqp==5.3.1
88
# via kombu
9-
asgiref==3.10.0
9+
asgiref==3.11.1
1010
# via django
1111
asn1crypto==1.5.1
1212
# via snowflake-connector-python
13-
awscli==1.42.59
13+
awscli==1.44.32
1414
# via -r requirements/reporting.in
1515
bcrypt==5.0.0
1616
# via paramiko
17-
billiard==4.2.2
17+
billiard==4.2.4
1818
# via celery
19-
boto3==1.40.59
19+
boto3==1.42.42
2020
# via
2121
# -r requirements/reporting.in
2222
# snowflake-connector-python
23-
botocore==1.40.59
23+
botocore==1.42.42
2424
# via
2525
# awscli
2626
# boto3
2727
# s3transfer
2828
# snowflake-connector-python
2929
celery==5.3.6
3030
# via -r requirements/reporting.in
31-
certifi==2025.10.5
31+
certifi==2026.1.4
3232
# via
3333
# py2neo
3434
# requests
@@ -41,7 +41,7 @@ charset-normalizer==3.4.4
4141
# via
4242
# requests
4343
# snowflake-connector-python
44-
click==8.3.0
44+
click==8.3.1
4545
# via
4646
# celery
4747
# click-didyoumean
@@ -56,7 +56,7 @@ click-repl==0.3.0
5656
# via celery
5757
colorama==0.4.6
5858
# via awscli
59-
cryptography==46.0.3
59+
cryptography==46.0.4
6060
# via
6161
# -r requirements/reporting.in
6262
# django-fernet-fields-v2
@@ -65,9 +65,10 @@ cryptography==46.0.3
6565
# pyjwt
6666
# pyopenssl
6767
# snowflake-connector-python
68-
django==4.2.25
68+
django==4.2.28
6969
# via
7070
# -c requirements/common_constraints.txt
71+
# -c requirements/constraints.txt
7172
# -r requirements/base.in
7273
# django-crum
7374
# django-fernet-fields-v2
@@ -127,9 +128,9 @@ edx-rest-api-client==6.2.0
127128
# via -r requirements/base.in
128129
factory-boy==3.3.3
129130
# via -r requirements/base.in
130-
faker==37.12.0
131+
faker==40.1.2
131132
# via factory-boy
132-
filelock==3.20.0
133+
filelock==3.20.3
133134
# via snowflake-connector-python
134135
idna==3.11
135136
# via
@@ -139,17 +140,17 @@ interchange==2021.0.4
139140
# via py2neo
140141
invoke==2.2.1
141142
# via paramiko
142-
jmespath==1.0.1
143+
jmespath==1.1.0
143144
# via
144145
# boto3
145146
# botocore
146-
kombu==5.5.4
147+
kombu==5.6.2
147148
# via celery
148149
monotonic==1.6
149150
# via py2neo
150-
mysql-connector-python==9.5.0
151+
mysql-connector-python==9.6.0
151152
# via -r requirements/base.in
152-
packaging==25.0
153+
packaging==26.0
153154
# via
154155
# kombu
155156
# py2neo
@@ -160,35 +161,35 @@ paramiko==4.0.0
160161
# via -r requirements/reporting.in
161162
pgpy==0.6.0
162163
# via -r requirements/reporting.in
163-
pillow==12.0.0
164+
pillow==12.1.0
164165
# via pansi
165-
platformdirs==4.5.0
166+
platformdirs==4.5.1
166167
# via snowflake-connector-python
167168
prompt-toolkit==3.0.52
168169
# via click-repl
169-
psutil==7.1.2
170+
psutil==7.2.2
170171
# via edx-django-utils
171172
py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
172173
# via -r requirements/reporting.in
173-
pyasn1==0.6.1
174+
pyasn1==0.6.2
174175
# via
175176
# pgpy
176177
# rsa
177-
pycparser==2.23
178+
pycparser==3.0
178179
# via cffi
179180
pygments==2.19.2
180181
# via py2neo
181-
pyjwt[crypto]==2.10.1
182+
pyjwt[crypto]==2.11.0
182183
# via
183184
# drf-jwt
184185
# edx-drf-extensions
185186
# edx-rest-api-client
186187
# snowflake-connector-python
187188
pyminizip==0.2.6
188189
# via -r requirements/reporting.in
189-
pymongo==4.15.3
190+
pymongo==4.16.0
190191
# via edx-opaque-keys
191-
pynacl==1.6.0
192+
pynacl==1.6.2
192193
# via
193194
# edx-django-utils
194195
# paramiko
@@ -215,7 +216,7 @@ rsa==4.7.2
215216
# via awscli
216217
rules==3.5
217218
# via -r requirements/base.in
218-
s3transfer==0.14.0
219+
s3transfer==0.16.0
219220
# via
220221
# awscli
221222
# boto3
@@ -228,31 +229,30 @@ six==1.17.0
228229
# py2neo
229230
# python-dateutil
230231
# vertica-python
231-
snowflake-connector-python==4.0.0
232+
snowflake-connector-python==4.2.0
232233
# via -r requirements/reporting.in
233234
sortedcontainers==2.4.0
234235
# via snowflake-connector-python
235-
sqlparse==0.5.3
236+
sqlparse==0.5.5
236237
# via django
237-
stevedore==5.5.0
238+
stevedore==5.6.0
238239
# via
239240
# edx-django-utils
240241
# edx-opaque-keys
241-
tomlkit==0.13.3
242+
tomlkit==0.14.0
242243
# via snowflake-connector-python
243244
typing-extensions==4.15.0
244245
# via
245246
# edx-opaque-keys
246247
# pyopenssl
247248
# snowflake-connector-python
248-
tzdata==2025.2
249+
tzdata==2025.3
249250
# via
250251
# celery
251-
# faker
252252
# kombu
253253
unicodecsv==0.14.1
254254
# via -r requirements/reporting.in
255-
urllib3==2.5.0
255+
urllib3==2.6.3
256256
# via
257257
# botocore
258258
# py2neo
@@ -264,7 +264,7 @@ vine==5.1.0
264264
# amqp
265265
# celery
266266
# kombu
267-
wcwidth==0.2.14
267+
wcwidth==0.5.3
268268
# via prompt-toolkit
269269

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

requirements/ci.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.12
2+
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
55
# make upgrade
66
#
7-
cachetools==6.2.1
7+
cachetools==7.0.0
88
# via tox
99
chardet==5.2.0
1010
# via tox
1111
colorama==0.4.6
1212
# via tox
13-
coverage==7.11.0
13+
coverage==7.13.3
1414
# via -r requirements/ci.in
1515
distlib==0.4.0
1616
# via virtualenv
17-
filelock==3.20.0
17+
filelock==3.20.3
1818
# via
1919
# tox
2020
# virtualenv
21-
packaging==25.0
21+
packaging==26.0
2222
# via
2323
# pyproject-api
2424
# tox
25-
platformdirs==4.5.0
25+
platformdirs==4.5.1
2626
# via
2727
# tox
2828
# virtualenv
2929
pluggy==1.6.0
3030
# via tox
3131
pyproject-api==1.10.0
3232
# via tox
33-
tox==4.32.0
33+
tox==4.34.1
3434
# via -r requirements/ci.in
35-
virtualenv==20.35.3
35+
virtualenv==20.36.1
3636
# via tox

requirements/common_constraints.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@
1313
# this file from Github directly. It does not require packaging in edx-lint.
1414

1515
# using LTS django version
16-
Django<5.0
16+
Django<6.0
1717

1818
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
1919
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
2020
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2121
elasticsearch<7.14.0
22+
23+
# pip 26 is incompatible with pip-tools hence causing failures during the build process
24+
# Make upgrade command and all requirements upgrade jobs are broken due to this.
25+
# The constraint can be removed once a release (pip-tools > 7.5.2) is available with support for pip 26
26+
# Issue to track this dependency and unpin later on: https://github.com/jazzband/pip-tools/issues/2319
27+
pip<26.0

requirements/constraints.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@
1212

1313
# Common constraints for edx repos
1414
-c common_constraints.txt
15+
16+
# This package is installed in the edx-analytics-data-api service,
17+
# which only supports Django<5. We're hard pinning here, too, to avoid
18+
# dependency management hell of supporting both Django 4 and 5.
19+
Django<5
20+
21+
# pip 25.3 is problematic with newer versions of pip-tools
22+
pip<25.3

0 commit comments

Comments
 (0)