Skip to content

Commit 7cdd262

Browse files
authored
Merge branch 'master' into fix/use-masqueraded-user-for-course-outline
2 parents 96d913d + 264ced2 commit 7cdd262

10 files changed

Lines changed: 19 additions & 30 deletions

File tree

requirements/edx-sandbox/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ sympy==1.14.0
8484
# via
8585
# -r requirements/edx-sandbox/base.in
8686
# openedx-calc
87-
tqdm==4.68.3
87+
tqdm==4.68.4
8888
# via nltk

requirements/edx/base.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ chardet==7.4.3
119119
# via
120120
# encutils
121121
# pysrt
122-
charset-normalizer==3.4.8
122+
charset-normalizer==3.4.9
123123
# via
124124
# requests
125125
# snowflake-connector-python
@@ -173,7 +173,7 @@ defusedxml==0.7.1
173173
# python3-openid
174174
# social-auth-core
175175
# xblocks-contrib
176-
django==5.2.15
176+
django==5.2.16
177177
# via
178178
# -c requirements/common_constraints.txt
179179
# -c requirements/constraints.txt
@@ -1207,7 +1207,7 @@ tomlkit==0.15.0
12071207
# via
12081208
# openedx-core
12091209
# snowflake-connector-python
1210-
tqdm==4.68.3
1210+
tqdm==4.68.4
12111211
# via nltk
12121212
typesense==2.0.0
12131213
# via
@@ -1270,8 +1270,6 @@ wcmatch==10.2.1
12701270
# via pycasbin
12711271
wcwidth==0.8.2
12721272
# via prompt-toolkit
1273-
web-fragments==4.0.0
1274-
# via -r requirements/edx/kernel.in
12751273
webencodings==0.5.1
12761274
# via
12771275
# bleach

requirements/edx/development.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ chardet==7.4.3
218218
# diff-cover
219219
# encutils
220220
# pysrt
221-
charset-normalizer==3.4.8
221+
charset-normalizer==3.4.9
222222
# via
223223
# -r requirements/edx/doc.txt
224224
# -r requirements/edx/testing.txt
@@ -337,7 +337,7 @@ distlib==0.4.3
337337
# via
338338
# -r requirements/edx/testing.txt
339339
# virtualenv
340-
django==5.2.15
340+
django==5.2.16
341341
# via
342342
# -c requirements/common_constraints.txt
343343
# -c requirements/constraints.txt
@@ -2138,7 +2138,7 @@ tomlkit==0.15.0
21382138
# snowflake-connector-python
21392139
tox==4.56.2
21402140
# via -r requirements/edx/testing.txt
2141-
tqdm==4.68.3
2141+
tqdm==4.68.4
21422142
# via
21432143
# -r requirements/edx/doc.txt
21442144
# -r requirements/edx/testing.txt
@@ -2261,10 +2261,6 @@ wcwidth==0.8.2
22612261
# -r requirements/edx/doc.txt
22622262
# -r requirements/edx/testing.txt
22632263
# prompt-toolkit
2264-
web-fragments==4.0.0
2265-
# via
2266-
# -r requirements/edx/doc.txt
2267-
# -r requirements/edx/testing.txt
22682264
webencodings==0.5.1
22692265
# via
22702266
# -r requirements/edx/doc.txt

requirements/edx/doc.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ chardet==7.4.3
169169
# -r requirements/edx/base.txt
170170
# encutils
171171
# pysrt
172-
charset-normalizer==3.4.8
172+
charset-normalizer==3.4.9
173173
# via
174174
# -r requirements/edx/base.txt
175175
# requests
@@ -237,7 +237,7 @@ defusedxml==0.7.1
237237
# python3-openid
238238
# social-auth-core
239239
# xblocks-contrib
240-
django==5.2.15
240+
django==5.2.16
241241
# via
242242
# -c requirements/common_constraints.txt
243243
# -c requirements/constraints.txt
@@ -1522,7 +1522,7 @@ tomlkit==0.15.0
15221522
# -r requirements/edx/base.txt
15231523
# openedx-core
15241524
# snowflake-connector-python
1525-
tqdm==4.68.3
1525+
tqdm==4.68.4
15261526
# via
15271527
# -r requirements/edx/base.txt
15281528
# nltk
@@ -1606,8 +1606,6 @@ wcwidth==0.8.2
16061606
# via
16071607
# -r requirements/edx/base.txt
16081608
# prompt-toolkit
1609-
web-fragments==4.0.0
1610-
# via -r requirements/edx/base.txt
16111609
webencodings==0.5.1
16121610
# via
16131611
# -r requirements/edx/base.txt

requirements/edx/kernel.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ sortedcontainers # Provides SortedKeyList, used for lists of
153153
stevedore # Support for runtime plugins, used for XBlocks and edx-platform Django app plugins
154154
unicodecsv # Easier support for CSV files with unicode text
155155
webob
156-
web-fragments # Provides the ability to render fragments of web pages
157156
wrapt # Better functools.wrapped. TODO: functools has since improved, maybe we can switch?
158157
XBlock[django] # Courseware component architecture
159158
xss-utils # https://github.com/openedx/edx-platform/pull/20633 Fix XSS via Translations

requirements/edx/semgrep.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ certifi==2026.6.17
3232
# requests
3333
cffi==2.1.0
3434
# via cryptography
35-
charset-normalizer==3.4.8
35+
charset-normalizer==3.4.9
3636
# via requests
3737
click==8.1.8
3838
# via

requirements/edx/testing.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ chardet==7.4.3
168168
# diff-cover
169169
# encutils
170170
# pysrt
171-
charset-normalizer==3.4.8
171+
charset-normalizer==3.4.9
172172
# via
173173
# -r requirements/edx/base.txt
174174
# requests
@@ -258,7 +258,7 @@ dill==0.4.1
258258
# via pylint
259259
distlib==0.4.3
260260
# via virtualenv
261-
django==5.2.15
261+
django==5.2.16
262262
# via
263263
# -c requirements/common_constraints.txt
264264
# -c requirements/constraints.txt
@@ -1597,7 +1597,7 @@ tomlkit==0.15.0
15971597
# snowflake-connector-python
15981598
tox==4.56.2
15991599
# via -r requirements/edx/testing.in
1600-
tqdm==4.68.3
1600+
tqdm==4.68.4
16011601
# via
16021602
# -r requirements/edx/base.txt
16031603
# nltk
@@ -1686,8 +1686,6 @@ wcwidth==0.8.2
16861686
# via
16871687
# -r requirements/edx/base.txt
16881688
# prompt-toolkit
1689-
web-fragments==4.0.0
1690-
# via -r requirements/edx/base.txt
16911689
webencodings==0.5.1
16921690
# via
16931691
# -r requirements/edx/base.txt

scripts/user_retirement/requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cffi==2.1.0
2222
# via
2323
# cryptography
2424
# pynacl
25-
charset-normalizer==3.4.8
25+
charset-normalizer==3.4.9
2626
# via requests
2727
click==8.4.2
2828
# via
@@ -32,7 +32,7 @@ cryptography==49.0.0
3232
# via
3333
# google-auth
3434
# pyjwt
35-
django==5.2.15
35+
django==5.2.16
3636
# via
3737
# -c requirements/common_constraints.txt
3838
# -c requirements/constraints.txt

scripts/user_retirement/requirements/testing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cffi==2.1.0
3333
# -r scripts/user_retirement/requirements/base.txt
3434
# cryptography
3535
# pynacl
36-
charset-normalizer==3.4.8
36+
charset-normalizer==3.4.9
3737
# via
3838
# -r scripts/user_retirement/requirements/base.txt
3939
# requests
@@ -49,7 +49,7 @@ cryptography==49.0.0
4949
# pyjwt
5050
ddt==1.7.2
5151
# via -r scripts/user_retirement/requirements/testing.in
52-
django==5.2.15
52+
django==5.2.16
5353
# via
5454
# -r scripts/user_retirement/requirements/base.txt
5555
# django-crum

scripts/xblock/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
certifi==2026.6.17
88
# via requests
9-
charset-normalizer==3.4.8
9+
charset-normalizer==3.4.9
1010
# via requests
1111
idna==3.18
1212
# via requests

0 commit comments

Comments
 (0)