Skip to content

Commit 1df1f55

Browse files
awais786awais786
authored
Merge pull request #178 from openedx/jenkins/upgrade-python-requirements-33ed1a3
Python Requirements Update
2 parents 33ed1a3 + 1cf0017 commit 1df1f55

File tree

10 files changed

+181
-134
lines changed

10 files changed

+181
-134
lines changed

‎requirements/base.txt

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
#
77
amqp==5.2.0
88
# via kombu
9-
asgiref==3.7.2
9+
asgiref==3.8.1
1010
# via django
1111
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
1212
# via
1313
# -c requirements/constraints.txt
1414
# celery
1515
# django
16+
# djangorestframework
1617
# kombu
1718
billiard==4.2.0
1819
# via celery
@@ -29,14 +30,15 @@ click==8.1.7
2930
# click-plugins
3031
# click-repl
3132
# edx-django-utils
32-
click-didyoumean==0.3.0
33+
click-didyoumean==0.3.1
3334
# via celery
3435
click-plugins==1.1.1
3536
# via celery
3637
click-repl==0.3.0
3738
# via celery
38-
django==4.2.10
39+
django==4.2.11
3940
# via
41+
# -c requirements/common_constraints.txt
4042
# -r requirements/base.in
4143
# django-crum
4244
# django-model-utils
@@ -55,32 +57,30 @@ django-model-utils==4.4.0
5557
# edx-celeryutils
5658
django-waffle==4.1.0
5759
# via edx-django-utils
58-
djangorestframework==3.14.0
60+
djangorestframework==3.15.1
5961
# via -r requirements/base.in
6062
edx-celeryutils==1.2.5
6163
# via -r requirements/base.in
62-
edx-django-utils==5.10.1
64+
edx-django-utils==5.12.0
6365
# via -r requirements/base.in
6466
jsonfield==3.1.0
6567
# via edx-celeryutils
66-
kombu==5.3.5
68+
kombu==5.3.6
6769
# via celery
68-
newrelic==9.7.0
70+
newrelic==9.8.0
6971
# via edx-django-utils
7072
pbr==6.0.0
7173
# via stevedore
7274
prompt-toolkit==3.0.43
7375
# via click-repl
7476
psutil==5.9.8
7577
# via edx-django-utils
76-
pycparser==2.21
78+
pycparser==2.22
7779
# via cffi
7880
pynacl==1.5.0
7981
# via edx-django-utils
80-
python-dateutil==2.8.2
82+
python-dateutil==2.9.0.post0
8183
# via celery
82-
pytz==2024.1
83-
# via djangorestframework
8484
simplejson==3.19.2
8585
# via -r requirements/base.in
8686
six==1.16.0
@@ -89,7 +89,7 @@ sqlparse==0.4.4
8989
# via django
9090
stevedore==5.2.0
9191
# via edx-django-utils
92-
typing-extensions==4.9.0
92+
typing-extensions==4.10.0
9393
# via
9494
# asgiref
9595
# kombu
@@ -104,3 +104,8 @@ vine==5.1.0
104104
# kombu
105105
wcwidth==0.2.13
106106
# via prompt-toolkit
107+
wheel==0.43.0
108+
# via -r requirements/base.in
109+
110+
# The following packages are considered to be unsafe in a requirements file:
111+
# setuptools

‎requirements/celery53.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ amqp==5.2.0
22
billiard==4.2.0
33
celery==5.3.6
44
click==8.1.7
5-
click-didyoumean==0.3.0
5+
click-didyoumean==0.3.1
66
click-repl==0.3.0
7-
kombu==5.3.5
7+
kombu==5.3.6
88
prompt-toolkit==3.0.43
99
vine==5.1.0

‎requirements/ci.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
#
55
# make upgrade
66
#
7-
cachetools==5.3.2
7+
cachetools==5.3.3
88
# via tox
99
chardet==5.2.0
1010
# via tox
1111
colorama==0.4.6
1212
# via tox
1313
distlib==0.3.8
1414
# via virtualenv
15-
filelock==3.13.1
15+
filelock==3.13.3
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.2
3636
# via -r requirements/ci.in
3737
virtualenv==20.25.1
3838
# via tox

‎requirements/common_constraints.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,20 @@
1313

1414

1515
# using LTS django version
16-
16+
Django<5.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
elasticsearch<7.14.0
2121

2222
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
2323
django-simple-history==3.0.0
24+
25+
# opentelemetry requires version 6.x at the moment:
26+
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
27+
# Normally this could be added as a constraint in edx-django-utils, where we're
28+
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
29+
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
30+
# So we need to pin it globally, for now.
31+
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
32+
importlib-metadata<7

‎requirements/dev.txt

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ amqp==5.2.0
88
# via
99
# -r requirements/quality.txt
1010
# kombu
11-
asgiref==3.7.2
11+
asgiref==3.8.1
1212
# via
1313
# -r requirements/quality.txt
1414
# django
15-
astroid==3.0.3
15+
astroid==3.1.0
1616
# via
1717
# -r requirements/quality.txt
1818
# pylint
@@ -23,16 +23,17 @@ backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
2323
# -r requirements/quality.txt
2424
# celery
2525
# django
26+
# djangorestframework
2627
# kombu
2728
billiard==4.2.0
2829
# via
2930
# -r requirements/quality.txt
3031
# celery
31-
build==1.0.3
32+
build==1.2.1
3233
# via
3334
# -r requirements/pip-tools.txt
3435
# pip-tools
35-
cachetools==5.3.2
36+
cachetools==5.3.3
3637
# via
3738
# -r requirements/ci.txt
3839
# tox
@@ -63,7 +64,7 @@ click==8.1.7
6364
# edx-django-utils
6465
# edx-lint
6566
# pip-tools
66-
click-didyoumean==0.3.0
67+
click-didyoumean==0.3.1
6768
# via
6869
# -r requirements/quality.txt
6970
# celery
@@ -79,19 +80,19 @@ click-repl==0.3.0
7980
# via
8081
# -r requirements/quality.txt
8182
# celery
82-
code-annotations==1.6.0
83+
code-annotations==1.7.0
8384
# via
8485
# -r requirements/quality.txt
8586
# edx-lint
8687
colorama==0.4.6
8788
# via
8889
# -r requirements/ci.txt
8990
# tox
90-
coverage[toml]==7.4.2
91+
coverage[toml]==7.4.4
9192
# via
9293
# -r requirements/quality.txt
9394
# pytest-cov
94-
ddt==1.7.1
95+
ddt==1.7.2
9596
# via -r requirements/quality.txt
9697
diff-cover==8.0.3
9798
# via -r requirements/dev.in
@@ -103,8 +104,9 @@ distlib==0.3.8
103104
# via
104105
# -r requirements/ci.txt
105106
# virtualenv
106-
django==4.2.10
107+
django==4.2.11
107108
# via
109+
# -c requirements/common_constraints.txt
108110
# -r requirements/quality.txt
109111
# django-crum
110112
# django-model-utils
@@ -126,11 +128,11 @@ django-waffle==4.1.0
126128
# via
127129
# -r requirements/quality.txt
128130
# edx-django-utils
129-
djangorestframework==3.14.0
131+
djangorestframework==3.15.1
130132
# via -r requirements/quality.txt
131133
edx-celeryutils==1.2.5
132134
# via -r requirements/quality.txt
133-
edx-django-utils==5.10.1
135+
edx-django-utils==5.12.0
134136
# via -r requirements/quality.txt
135137
edx-i18n-tools==1.3.0
136138
# via -r requirements/dev.in
@@ -140,15 +142,20 @@ exceptiongroup==1.2.0
140142
# via
141143
# -r requirements/quality.txt
142144
# pytest
143-
filelock==3.13.1
145+
filelock==3.13.3
144146
# via
145147
# -r requirements/ci.txt
146148
# tox
147149
# virtualenv
148150
freezegun==1.4.0
149151
# via -r requirements/quality.txt
150-
importlib-metadata==7.0.1
152+
greenlet==3.0.3
153+
# via
154+
# -r requirements/quality.txt
155+
# sqlalchemy
156+
importlib-metadata==6.11.0
151157
# via
158+
# -c requirements/common_constraints.txt
152159
# -r requirements/pip-tools.txt
153160
# build
154161
iniconfig==2.0.0
@@ -168,11 +175,11 @@ jsonfield==3.1.0
168175
# via
169176
# -r requirements/quality.txt
170177
# edx-celeryutils
171-
kombu==5.3.5
178+
kombu==5.3.6
172179
# via
173180
# -r requirements/quality.txt
174181
# celery
175-
lxml==5.1.0
182+
lxml==5.2.0
176183
# via edx-i18n-tools
177184
markupsafe==2.1.5
178185
# via
@@ -184,11 +191,11 @@ mccabe==0.7.0
184191
# pylint
185192
mock==5.1.0
186193
# via -r requirements/quality.txt
187-
newrelic==9.7.0
194+
newrelic==9.8.0
188195
# via
189196
# -r requirements/quality.txt
190197
# edx-django-utils
191-
packaging==23.2
198+
packaging==24.0
192199
# via
193200
# -r requirements/ci.txt
194201
# -r requirements/pip-tools.txt
@@ -203,7 +210,7 @@ pbr==6.0.0
203210
# via
204211
# -r requirements/quality.txt
205212
# stevedore
206-
pip-tools==7.4.0
213+
pip-tools==7.4.1
207214
# via -r requirements/pip-tools.txt
208215
platformdirs==4.2.0
209216
# via
@@ -231,15 +238,15 @@ psutil==5.9.8
231238
# edx-django-utils
232239
pycodestyle==2.11.1
233240
# via -r requirements/quality.txt
234-
pycparser==2.21
241+
pycparser==2.22
235242
# via
236243
# -r requirements/quality.txt
237244
# cffi
238245
pydocstyle==6.3.0
239246
# via -r requirements/quality.txt
240247
pygments==2.17.2
241248
# via diff-cover
242-
pylint==3.0.3
249+
pylint==3.1.0
243250
# via
244251
# -r requirements/quality.txt
245252
# edx-lint
@@ -272,16 +279,16 @@ pyproject-hooks==1.0.0
272279
# -r requirements/pip-tools.txt
273280
# build
274281
# pip-tools
275-
pytest==8.0.1
282+
pytest==8.1.1
276283
# via
277284
# -r requirements/quality.txt
278285
# pytest-cov
279286
# pytest-django
280-
pytest-cov==4.1.0
287+
pytest-cov==5.0.0
281288
# via -r requirements/quality.txt
282289
pytest-django==4.8.0
283290
# via -r requirements/quality.txt
284-
python-dateutil==2.8.2
291+
python-dateutil==2.9.0.post0
285292
# via
286293
# -r requirements/quality.txt
287294
# celery
@@ -290,10 +297,6 @@ python-slugify==8.0.4
290297
# via
291298
# -r requirements/quality.txt
292299
# code-annotations
293-
pytz==2024.1
294-
# via
295-
# -r requirements/quality.txt
296-
# djangorestframework
297300
pyyaml==6.0.1
298301
# via
299302
# -r requirements/quality.txt
@@ -310,7 +313,7 @@ snowballstemmer==2.2.0
310313
# via
311314
# -r requirements/quality.txt
312315
# pydocstyle
313-
sqlalchemy==2.0.27
316+
sqlalchemy==2.0.29
314317
# via -r requirements/quality.txt
315318
sqlparse==0.4.4
316319
# via
@@ -338,13 +341,13 @@ tomli==2.0.1
338341
# pyproject-hooks
339342
# pytest
340343
# tox
341-
tomlkit==0.12.3
344+
tomlkit==0.12.4
342345
# via
343346
# -r requirements/quality.txt
344347
# pylint
345-
tox==4.13.0
348+
tox==4.14.2
346349
# via -r requirements/ci.txt
347-
typing-extensions==4.9.0
350+
typing-extensions==4.10.0
348351
# via
349352
# -r requirements/quality.txt
350353
# asgiref
@@ -371,11 +374,12 @@ wcwidth==0.2.13
371374
# via
372375
# -r requirements/quality.txt
373376
# prompt-toolkit
374-
wheel==0.42.0
377+
wheel==0.43.0
375378
# via
376379
# -r requirements/pip-tools.txt
380+
# -r requirements/quality.txt
377381
# pip-tools
378-
zipp==3.17.0
382+
zipp==3.18.1
379383
# via
380384
# -r requirements/pip-tools.txt
381385
# importlib-metadata

0 commit comments

Comments
 (0)