Skip to content

Commit 9fa6b54

Browse files
author
Feanil Patel
authored
Merge pull request #726 from openedx/feanil/fix_django_dep
Unpin the Django dependency
2 parents 24f7f3d + e3e059f commit 9fa6b54

File tree

8 files changed

+81
-45
lines changed

8 files changed

+81
-45
lines changed

‎requirements/ci.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ filelock==3.13.1
1818
# via
1919
# tox
2020
# virtualenv
21-
packaging==23.2
21+
packaging==24.0
2222
# via
2323
# pyproject-api
2424
# tox

‎requirements/dev.txt‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ appdirs==1.4.4
1212
# via
1313
# -r requirements/test.txt
1414
# fs
15+
asgiref==3.7.2
16+
# via
17+
# -r requirements/test.txt
18+
# django
1519
astroid==3.1.0
1620
# via
1721
# -r requirements/test.txt
@@ -21,11 +25,15 @@ attrs==23.2.0
2125
# via
2226
# -r requirements/test.txt
2327
# hypothesis
24-
boto3==1.34.59
28+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
29+
# via
30+
# -r requirements/test.txt
31+
# django
32+
boto3==1.34.62
2533
# via
2634
# -r requirements/test.txt
2735
# fs-s3fs
28-
botocore==1.34.59
36+
botocore==1.34.62
2937
# via
3038
# -r requirements/test.txt
3139
# boto3
@@ -56,7 +64,7 @@ click-log==0.4.0
5664
# via
5765
# -r requirements/test.txt
5866
# edx-lint
59-
code-annotations==1.6.0
67+
code-annotations==1.7.0
6068
# via
6169
# -r requirements/test.txt
6270
# edx-lint
@@ -85,7 +93,7 @@ distlib==0.3.8
8593
# -r requirements/ci.txt
8694
# -r requirements/test.txt
8795
# virtualenv
88-
django==2.2.28
96+
django==4.2.11
8997
# via
9098
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
9199
# -r requirements/test.txt
@@ -114,10 +122,11 @@ fs-s3fs==1.1.1
114122
# via
115123
# -r requirements/test.txt
116124
# openedx-django-pyfs
117-
hypothesis==6.99.0
125+
hypothesis==6.99.6
118126
# via -r requirements/test.txt
119-
importlib-metadata==7.0.2
127+
importlib-metadata==6.11.0
120128
# via
129+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
121130
# -r requirements/pip-tools.txt
122131
# build
123132
inflect==7.0.0
@@ -168,7 +177,7 @@ mock==5.1.0
168177
# via -r requirements/test.txt
169178
openedx-django-pyfs==3.5.0
170179
# via -r requirements/test.txt
171-
packaging==23.2
180+
packaging==24.0
172181
# via
173182
# -r requirements/ci.txt
174183
# -r requirements/pip-tools.txt
@@ -201,7 +210,7 @@ pluggy==1.4.0
201210
# tox
202211
pycodestyle==2.11.1
203212
# via -r requirements/test.txt
204-
pydantic==2.6.3
213+
pydantic==2.6.4
205214
# via
206215
# -r requirements/test.txt
207216
# inflect
@@ -265,9 +274,7 @@ python-slugify==8.0.4
265274
# -r requirements/test.txt
266275
# code-annotations
267276
pytz==2024.1
268-
# via
269-
# -r requirements/test.txt
270-
# django
277+
# via -r requirements/test.txt
271278
pyyaml==6.0.1
272279
# via
273280
# -r requirements/test.txt
@@ -327,6 +334,7 @@ typing-extensions==4.10.0
327334
# via
328335
# -r requirements/test.txt
329336
# annotated-types
337+
# asgiref
330338
# astroid
331339
# edx-opaque-keys
332340
# inflect
@@ -346,11 +354,11 @@ web-fragments==2.1.0
346354
# via -r requirements/test.txt
347355
webob==1.8.7
348356
# via -r requirements/test.txt
349-
wheel==0.42.0
357+
wheel==0.43.0
350358
# via
351359
# -r requirements/pip-tools.txt
352360
# pip-tools
353-
zipp==3.17.0
361+
zipp==3.18.0
354362
# via
355363
# -r requirements/pip-tools.txt
356364
# importlib-metadata

‎requirements/django.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
-r base.txt # Core XBlock dependencies
77

8-
Django>=2.2,<3.0
8+
Django
99
openedx-django-pyfs>=1.0.5
1010
lazy
11+
12+
# Needed until we drop testing on Python 3.8 so that
13+
# we don't try to install this on newer versions of python.
14+
backports.zoneinfo;python_version<"3.9"

‎requirements/django.txt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ appdirs==1.4.4
88
# via
99
# -r requirements/base.txt
1010
# fs
11-
boto3==1.34.59
11+
asgiref==3.7.2
12+
# via django
13+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
14+
# via
15+
# -r requirements/django.in
16+
# django
17+
boto3==1.34.62
1218
# via fs-s3fs
13-
botocore==1.34.59
19+
botocore==1.34.62
1420
# via
1521
# boto3
1622
# s3transfer
17-
django==2.2.28
23+
django==4.2.11
1824
# via
1925
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
2026
# -r requirements/django.in
@@ -59,9 +65,7 @@ python-dateutil==2.9.0.post0
5965
# -r requirements/base.txt
6066
# botocore
6167
pytz==2024.1
62-
# via
63-
# -r requirements/base.txt
64-
# django
68+
# via -r requirements/base.txt
6569
pyyaml==6.0.1
6670
# via -r requirements/base.txt
6771
s3transfer==0.10.0
@@ -83,6 +87,7 @@ stevedore==5.2.0
8387
typing-extensions==4.10.0
8488
# via
8589
# -r requirements/base.txt
90+
# asgiref
8691
# edx-opaque-keys
8792
urllib3==1.26.18
8893
# via botocore

‎requirements/doc.txt‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,25 @@ appdirs==1.4.4
1212
# via
1313
# -r requirements/django.txt
1414
# fs
15+
asgiref==3.7.2
16+
# via
17+
# -r requirements/django.txt
18+
# django
1519
babel==2.14.0
1620
# via
1721
# pydata-sphinx-theme
1822
# sphinx
23+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
24+
# via
25+
# -r requirements/django.txt
26+
# django
1927
beautifulsoup4==4.12.3
2028
# via pydata-sphinx-theme
21-
boto3==1.34.59
29+
boto3==1.34.62
2230
# via
2331
# -r requirements/django.txt
2432
# fs-s3fs
25-
botocore==1.34.59
33+
botocore==1.34.62
2634
# via
2735
# -r requirements/django.txt
2836
# boto3
@@ -31,7 +39,7 @@ certifi==2024.2.2
3139
# via requests
3240
charset-normalizer==3.3.2
3341
# via requests
34-
django==2.2.28
42+
django==4.2.11
3543
# via
3644
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3745
# -r requirements/django.txt
@@ -55,8 +63,10 @@ idna==3.6
5563
# via requests
5664
imagesize==1.4.1
5765
# via sphinx
58-
importlib-metadata==7.0.2
59-
# via sphinx
66+
importlib-metadata==6.11.0
67+
# via
68+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
69+
# sphinx
6070
jinja2==3.1.3
6171
# via sphinx
6272
jmespath==1.0.1
@@ -81,7 +91,7 @@ mock==5.1.0
8191
# via -r requirements/doc.in
8292
openedx-django-pyfs==3.5.0
8393
# via -r requirements/django.txt
84-
packaging==23.2
94+
packaging==24.0
8595
# via
8696
# pydata-sphinx-theme
8797
# sphinx
@@ -108,7 +118,6 @@ pytz==2024.1
108118
# via
109119
# -r requirements/django.txt
110120
# babel
111-
# django
112121
pyyaml==6.0.1
113122
# via -r requirements/django.txt
114123
requests==2.31.0
@@ -159,6 +168,7 @@ stevedore==5.2.0
159168
typing-extensions==4.10.0
160169
# via
161170
# -r requirements/django.txt
171+
# asgiref
162172
# edx-opaque-keys
163173
# pydata-sphinx-theme
164174
urllib3==1.26.18
@@ -170,7 +180,7 @@ web-fragments==2.1.0
170180
# via -r requirements/django.txt
171181
webob==1.8.7
172182
# via -r requirements/django.txt
173-
zipp==3.17.0
183+
zipp==3.18.0
174184
# via importlib-metadata
175185

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

‎requirements/pip-tools.txt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ build==1.1.1
88
# via pip-tools
99
click==8.1.7
1010
# via pip-tools
11-
importlib-metadata==7.0.2
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
1517
pip-tools==7.4.1
1618
# via -r requirements/pip-tools.in
@@ -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:

‎requirements/pip.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
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:
1111
pip==24.0
1212
# via -r requirements/pip.in
13-
setuptools==69.1.1
13+
setuptools==69.2.0
1414
# via -r requirements/pip.in

‎requirements/test.txt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,26 @@ appdirs==1.4.4
1010
# via
1111
# -r requirements/django.txt
1212
# fs
13+
asgiref==3.7.2
14+
# via
15+
# -r requirements/django.txt
16+
# django
1317
astroid==3.1.0
1418
# via
1519
# -r requirements/test.in
1620
# pylint
1721
# pylint-celery
1822
attrs==23.2.0
1923
# via hypothesis
20-
boto3==1.34.59
24+
backports-zoneinfo==0.2.1 ; python_version < "3.9"
25+
# via
26+
# -r requirements/django.txt
27+
# django
28+
boto3==1.34.62
2129
# via
2230
# -r requirements/django.txt
2331
# fs-s3fs
24-
botocore==1.34.59
32+
botocore==1.34.62
2533
# via
2634
# -r requirements/django.txt
2735
# boto3
@@ -37,7 +45,7 @@ click==8.1.7
3745
# edx-lint
3846
click-log==0.4.0
3947
# via edx-lint
40-
code-annotations==1.6.0
48+
code-annotations==1.7.0
4149
# via edx-lint
4250
colorama==0.4.6
4351
# via tox
@@ -80,7 +88,7 @@ fs-s3fs==1.1.1
8088
# via
8189
# -r requirements/django.txt
8290
# openedx-django-pyfs
83-
hypothesis==6.99.0
91+
hypothesis==6.99.6
8492
# via -r requirements/test.in
8593
inflect==7.0.0
8694
# via jinja2-pluralize
@@ -119,7 +127,7 @@ mock==5.1.0
119127
# via -r requirements/test.in
120128
openedx-django-pyfs==3.5.0
121129
# via -r requirements/django.txt
122-
packaging==23.2
130+
packaging==24.0
123131
# via
124132
# pyproject-api
125133
# pytest
@@ -142,7 +150,7 @@ pluggy==1.4.0
142150
# tox
143151
pycodestyle==2.11.1
144152
# via -r requirements/test.in
145-
pydantic==2.6.3
153+
pydantic==2.6.4
146154
# via inflect
147155
pydantic-core==2.16.3
148156
# via pydantic
@@ -185,9 +193,7 @@ python-dateutil==2.9.0.post0
185193
python-slugify==8.0.4
186194
# via code-annotations
187195
pytz==2024.1
188-
# via
189-
# -r requirements/django.txt
190-
# django
196+
# via -r requirements/django.txt
191197
pyyaml==6.0.1
192198
# via
193199
# -r requirements/django.txt
@@ -233,6 +239,7 @@ typing-extensions==4.10.0
233239
# via
234240
# -r requirements/django.txt
235241
# annotated-types
242+
# asgiref
236243
# astroid
237244
# edx-opaque-keys
238245
# inflect

0 commit comments

Comments
 (0)