Skip to content

Commit 755f757

Browse files
authored
Merge pull request #36837 from openedx/repo-tools/upgrade-python-requirements-276e189
chore: Upgrade Python requirements
2 parents 98e39aa + 6f8eba4 commit 755f757

File tree

20 files changed

+221
-201
lines changed

20 files changed

+221
-201
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# SERIOUSLY.
6565
#
6666
# ------------------------------
67-
# Generated by edx-lint version: 5.3.0
67+
# Generated by edx-lint version: 5.6.0
6868
# ------------------------------
6969
[*]
7070
end_of_line = lf
@@ -97,4 +97,4 @@ max_line_length = 72
9797
[*.rst]
9898
max_line_length = 79
9999

100-
# eecef7d3f7f334de2348fe1b4b0b48d605f7dcab
100+
# 3eb1e01bd9ba6cdf1e5d0a493581c4ea14404b67

.github/workflows/pylint-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- module-name: lms-2
1919
path: "lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py"
2020
- module-name: openedx-1
21-
path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/tests/ openedx/core/djangoapps/course_live/"
21+
path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/djangoapps/course_live/"
2222
- module-name: openedx-2
2323
path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
2424
- module-name: common

pylint_django_settings.py renamed to openedx/core/tests/pylint_django_settings.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
"""
2+
This is a plugin that helps pylint figure out what DJANGO_SETTINGS_MODULE to use for linting different files. Since the
3+
LMS and CMS files have different expectations about what django settings including which installed apps and settings are
4+
set when the code is run.
5+
"""
16
import os
27
import sys
38

@@ -40,7 +45,7 @@ def register(linter):
4045
"""
4146
Placeholder function to register the plugin with pylint.
4247
"""
43-
pass
48+
return
4449

4550

4651
def load_configuration(linter):

pylintrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
# SERIOUSLY.
6565
#
6666
# ------------------------------
67-
# Generated by edx-lint version: 5.4.1
67+
# Generated by edx-lint version: 5.6.0
6868
# ------------------------------
6969
[MASTER]
7070
ignore = ,.git,.tox,migrations,node_modules,.pycharm_helpers
7171
persistent = yes
72-
load-plugins = edx_lint.pylint,pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
72+
load-plugins = edx_lint.pylint,openedx.core.tests.pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
7373

7474
[MESSAGES CONTROL]
7575
enable =
@@ -414,4 +414,4 @@ int-import-graph =
414414
[EXCEPTIONS]
415415
overgeneral-exceptions = builtins.Exception
416416

417-
# 5aea7d7fb264005eb373099c856a54cdfa4f311c
417+
# d6e4348dec0a8eb2752fc4fe02315286c298aeff

pylintrc_tweaks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# pylintrc tweaks for use with edx_lint.
22
[MASTER]
33
ignore+ = ,.git,.tox,migrations,node_modules,.pycharm_helpers
4-
load-plugins = edx_lint.pylint,pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
4+
load-plugins = edx_lint.pylint,openedx.core.tests.pylint_django_settings,pylint_django,pylint_celery,pylint_pytest
55

66
[MESSAGES CONTROL]
77
disable+ =

requirements/edx-sandbox/base.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ cffi==1.17.1
88
# via cryptography
99
chem==2.0.0
1010
# via -r requirements/edx-sandbox/base.in
11-
click==8.2.0
11+
click==8.2.1
1212
# via nltk
1313
codejail-includes==1.0.0
1414
# via -r requirements/edx-sandbox/base.in
1515
contourpy==1.3.2
1616
# via matplotlib
17-
cryptography==45.0.2
17+
cryptography==45.0.3
1818
# via -r requirements/edx-sandbox/base.in
1919
cycler==0.12.1
2020
# via matplotlib
21-
fonttools==4.57.0
21+
fonttools==4.58.1
2222
# via matplotlib
23-
joblib==1.5.0
23+
joblib==1.5.1
2424
# via nltk
2525
kiwisolver==1.4.8
2626
# via matplotlib
@@ -40,7 +40,7 @@ matplotlib==3.10.3
4040
# via -r requirements/edx-sandbox/base.in
4141
mpmath==1.3.0
4242
# via sympy
43-
networkx==3.4.2
43+
networkx==3.5
4444
# via -r requirements/edx-sandbox/base.in
4545
nltk==3.9.1
4646
# via

requirements/edx/assets.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
click==8.2.0
7+
click==8.2.1
88
# via -r requirements/edx/assets.in
99
libsass==0.10.0
1010
# via

requirements/edx/base.txt

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ acid-xblock==0.4.1
1010
# via -r requirements/edx/kernel.in
1111
aiohappyeyeballs==2.6.1
1212
# via aiohttp
13-
aiohttp==3.11.18
13+
aiohttp==3.12.6
1414
# via
1515
# geoip2
1616
# openai
@@ -68,14 +68,14 @@ bleach[css]==6.2.0
6868
# xblock-poll
6969
boto==2.49.0
7070
# via -r requirements/edx/kernel.in
71-
boto3==1.38.18
71+
boto3==1.38.27
7272
# via
7373
# -r requirements/edx/kernel.in
7474
# django-ses
7575
# fs-s3fs
7676
# ora2
7777
# snowflake-connector-python
78-
botocore==1.38.18
78+
botocore==1.38.27
7979
# via
8080
# -r requirements/edx/kernel.in
8181
# boto3
@@ -91,7 +91,7 @@ cachetools==5.5.2
9191
# google-auth
9292
camel-converter[pydantic]==4.0.1
9393
# via meilisearch
94-
celery==5.5.2
94+
celery==5.5.3
9595
# via
9696
# -c requirements/edx/../constraints.txt
9797
# -r requirements/edx/kernel.in
@@ -119,7 +119,7 @@ charset-normalizer==3.4.2
119119
# snowflake-connector-python
120120
chem==2.0.0
121121
# via -r requirements/edx/kernel.in
122-
click==8.2.0
122+
click==8.2.1
123123
# via
124124
# celery
125125
# click-didyoumean
@@ -143,7 +143,7 @@ codejail-includes==1.0.0
143143
# via -r requirements/edx/kernel.in
144144
crowdsourcehinter-xblock==0.8
145145
# via -r requirements/edx/bundled.in
146-
cryptography==44.0.3
146+
cryptography==45.0.3
147147
# via
148148
# -r requirements/edx/kernel.in
149149
# django-fernet-fields-v2
@@ -493,6 +493,7 @@ edx-opaque-keys[django]==3.0.0
493493
# openedx-events
494494
# openedx-filters
495495
# ora2
496+
# xblocks-contrib
496497
edx-organizations==6.13.0
497498
# via -r requirements/edx/kernel.in
498499
edx-proctoring==5.2.0
@@ -512,7 +513,7 @@ edx-search==4.1.3
512513
# openedx-forum
513514
edx-sga==0.25.3
514515
# via -r requirements/edx/bundled.in
515-
edx-submissions==3.10.1
516+
edx-submissions==3.11.1
516517
# via
517518
# -r requirements/edx/kernel.in
518519
# ora2
@@ -530,7 +531,7 @@ edx-toggles==5.3.0
530531
# edxval
531532
# event-tracking
532533
# ora2
533-
edx-when==2.5.2
534+
edx-when==3.0.0
534535
# via
535536
# -r requirements/edx/kernel.in
536537
# edx-proctoring
@@ -578,16 +579,16 @@ geoip2==5.1.0
578579
# via -r requirements/edx/kernel.in
579580
glob2==0.7
580581
# via -r requirements/edx/kernel.in
581-
google-api-core[grpc]==2.24.2
582+
google-api-core[grpc]==2.25.0
582583
# via
583584
# firebase-admin
584585
# google-api-python-client
585586
# google-cloud-core
586587
# google-cloud-firestore
587588
# google-cloud-storage
588-
google-api-python-client==2.169.0
589+
google-api-python-client==2.170.0
589590
# via firebase-admin
590-
google-auth==2.40.1
591+
google-auth==2.40.2
591592
# via
592593
# google-api-core
593594
# google-api-python-client
@@ -615,11 +616,11 @@ googleapis-common-protos==1.70.0
615616
# via
616617
# google-api-core
617618
# grpcio-status
618-
grpcio==1.71.0
619+
grpcio==1.72.1
619620
# via
620621
# google-api-core
621622
# grpcio-status
622-
grpcio-status==1.71.0
623+
grpcio-status==1.72.1
623624
# via google-api-core
624625
gunicorn==23.0.0
625626
# via -r requirements/edx/kernel.in
@@ -633,7 +634,7 @@ httplib2==0.22.0
633634
# via
634635
# google-api-python-client
635636
# google-auth-httplib2
636-
icalendar==6.3.0
637+
icalendar==6.3.1
637638
# via -r requirements/edx/kernel.in
638639
idna==3.10
639640
# via
@@ -657,7 +658,7 @@ jmespath==1.0.1
657658
# via
658659
# boto3
659660
# botocore
660-
joblib==1.5.0
661+
joblib==1.5.1
661662
# via nltk
662663
jsondiff==2.2.1
663664
# via edx-enterprise
@@ -670,7 +671,7 @@ jsonfield==3.1.0
670671
# edx-submissions
671672
# lti-consumer-xblock
672673
# ora2
673-
jsonschema==4.23.0
674+
jsonschema==4.24.0
674675
# via
675676
# drf-spectacular
676677
# optimizely-sdk
@@ -680,7 +681,7 @@ jwcrypto==1.5.6
680681
# via
681682
# django-oauth-toolkit
682683
# pylti1p3
683-
kombu==5.5.3
684+
kombu==5.5.4
684685
# via celery
685686
laboratory==1.0.2
686687
# via -r requirements/edx/kernel.in
@@ -757,7 +758,9 @@ mysqlclient==2.2.7
757758
# -r requirements/edx/kernel.in
758759
# openedx-forum
759760
nh3==0.2.21
760-
# via -r requirements/edx/kernel.in
761+
# via
762+
# -r requirements/edx/kernel.in
763+
# xblocks-contrib
761764
nltk==3.9.1
762765
# via chem
763766
nodeenv==1.9.1
@@ -776,6 +779,7 @@ oauthlib==3.2.2
776779
# lti-consumer-xblock
777780
# requests-oauthlib
778781
# social-auth-core
782+
# xblocks-contrib
779783
olxcleaner==0.3.0
780784
# via -r requirements/edx/kernel.in
781785
openai==0.28.1
@@ -827,6 +831,7 @@ packaging==25.0
827831
# via
828832
# drf-yasg
829833
# gunicorn
834+
# kombu
830835
# snowflake-connector-python
831836
paramiko==3.5.1
832837
# via edx-enterprise
@@ -867,7 +872,7 @@ proto-plus==1.26.1
867872
# via
868873
# google-api-core
869874
# google-cloud-firestore
870-
protobuf==5.29.4
875+
protobuf==6.31.1
871876
# via
872877
# google-api-core
873878
# google-cloud-firestore
@@ -895,7 +900,7 @@ pycryptodomex==3.23.0
895900
# edx-proctoring
896901
# lti-consumer-xblock
897902
# pyjwkest
898-
pydantic==2.11.4
903+
pydantic==2.11.5
899904
# via camel-converter
900905
pydantic-core==2.33.2
901906
# via pydantic
@@ -967,7 +972,7 @@ python-ipware==3.0.0
967972
# via django-ipware
968973
python-slugify==8.0.4
969974
# via code-annotations
970-
python-swiftclient==4.7.0
975+
python-swiftclient==4.8.0
971976
# via ora2
972977
python3-openid==3.2.0 ; python_version >= "3"
973978
# via
@@ -1007,7 +1012,7 @@ random2==1.0.2
10071012
# via -r requirements/edx/kernel.in
10081013
recommender-xblock==3.1.0
10091014
# via -r requirements/edx/bundled.in
1010-
redis==6.1.0
1015+
redis==6.2.0
10111016
# via
10121017
# -r requirements/edx/kernel.in
10131018
# walrus
@@ -1047,7 +1052,7 @@ requests-oauthlib==2.0.0
10471052
# via
10481053
# -r requirements/edx/kernel.in
10491054
# social-auth-core
1050-
rpds-py==0.25.0
1055+
rpds-py==0.25.1
10511056
# via
10521057
# jsonschema
10531058
# referencing
@@ -1059,7 +1064,7 @@ rules==3.5
10591064
# edx-enterprise
10601065
# edx-proctoring
10611066
# openedx-learning
1062-
s3transfer==0.12.0
1067+
s3transfer==0.13.0
10631068
# via boto3
10641069
sailthru-client==2.2.3
10651070
# via edx-ace
@@ -1151,7 +1156,7 @@ tqdm==4.67.1
11511156
# via
11521157
# nltk
11531158
# openai
1154-
typing-extensions==4.13.2
1159+
typing-extensions==4.14.0
11551160
# via
11561161
# beautifulsoup4
11571162
# django-countries
@@ -1164,7 +1169,7 @@ typing-extensions==4.13.2
11641169
# referencing
11651170
# snowflake-connector-python
11661171
# typing-inspection
1167-
typing-inspection==0.4.0
1172+
typing-inspection==0.4.1
11681173
# via pydantic
11691174
tzdata==2025.2
11701175
# via
@@ -1241,13 +1246,13 @@ xblock-drag-and-drop-v2==5.0.2
12411246
# via -r requirements/edx/bundled.in
12421247
xblock-google-drive==0.8.1
12431248
# via -r requirements/edx/bundled.in
1244-
xblock-poll==1.14.1
1249+
xblock-poll==1.15.1
12451250
# via -r requirements/edx/bundled.in
12461251
xblock-utils==4.0.0
12471252
# via
12481253
# edx-sga
12491254
# xblock-poll
1250-
xblocks-contrib==0.3.0
1255+
xblocks-contrib==0.4.0
12511256
# via -r requirements/edx/bundled.in
12521257
xmlsec==1.3.14
12531258
# via
@@ -1257,7 +1262,7 @@ xss-utils==0.8.0
12571262
# via -r requirements/edx/kernel.in
12581263
yarl==1.20.0
12591264
# via aiohttp
1260-
zipp==3.21.0
1265+
zipp==3.22.0
12611266
# via importlib-metadata
12621267

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

requirements/edx/coverage.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
chardet==5.2.0
88
# via diff-cover
9-
coverage==7.8.0
9+
coverage==7.8.2
1010
# via -r requirements/edx/coverage.in
11-
diff-cover==9.2.4
11+
diff-cover==9.3.2
1212
# via -r requirements/edx/coverage.in
1313
jinja2==3.1.6
1414
# via diff-cover

0 commit comments

Comments
 (0)