Skip to content

Commit 4cf1c96

Browse files
authored
Merge pull request #183 from openedx/bmtcril/fix_pip
chore: Fix and run make upgrade
2 parents 21a7501 + c1ea26e commit 4cf1c96

8 files changed

Lines changed: 40 additions & 37 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS)
3838
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
3939
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
4040
pip install -qr requirements/pip-tools.txt
41+
pip install -qr requirements/pip.txt
4142
# Make sure to compile files after any other files they include!
4243
$(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in
4344
$(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in

requirements/base.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ click-repl==0.3.0
3636
# via celery
3737
code-annotations==2.3.0
3838
# via edx-toggles
39-
django==4.2.25
39+
django==5.2.8
4040
# via
4141
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
4242
# -r requirements/base.in
@@ -98,13 +98,13 @@ prison==0.2.1
9898
# via -r requirements/base.in
9999
prompt-toolkit==3.0.52
100100
# via click-repl
101-
psutil==7.1.1
101+
psutil==7.1.3
102102
# via edx-django-utils
103103
pycparser==2.23
104104
# via cffi
105105
pymongo==4.15.3
106106
# via edx-opaque-keys
107-
pynacl==1.6.0
107+
pynacl==1.6.1
108108
# via edx-django-utils
109109
python-dateutil==2.9.0.post0
110110
# via
@@ -119,7 +119,7 @@ pyyaml==6.0.3
119119
# code-annotations
120120
# superset-api-client
121121
# xblock
122-
redis==6.4.0
122+
redis==7.0.1
123123
# via -r requirements/base.in
124124
requests==2.32.5
125125
# via

requirements/ci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pluggy==1.6.0
2828
# via tox
2929
pyproject-api==1.10.0
3030
# via tox
31-
tox==4.31.0
31+
tox==4.32.0
3232
# via -r requirements/ci.in
33-
virtualenv==20.35.3
33+
virtualenv==20.35.4
3434
# via tox

requirements/dev.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ billiard==4.2.2
2525
# via
2626
# -r requirements/quality.txt
2727
# celery
28-
black==25.9.0
28+
black==25.11.0
2929
# via
3030
# -r requirements/dev.in
3131
# -r requirements/quality.txt
@@ -95,7 +95,7 @@ colorama==0.4.6
9595
# via
9696
# -r requirements/ci.txt
9797
# tox
98-
coverage[toml]==7.11.0
98+
coverage[toml]==7.11.3
9999
# via
100100
# -r requirements/quality.txt
101101
# pytest-cov
@@ -111,7 +111,7 @@ distlib==0.4.0
111111
# via
112112
# -r requirements/ci.txt
113113
# virtualenv
114-
django==4.2.25
114+
django==5.2.8
115115
# via
116116
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
117117
# -r requirements/quality.txt
@@ -269,7 +269,7 @@ prompt-toolkit==3.0.52
269269
# via
270270
# -r requirements/quality.txt
271271
# click-repl
272-
psutil==7.1.1
272+
psutil==7.1.3
273273
# via
274274
# -r requirements/quality.txt
275275
# edx-django-utils
@@ -310,7 +310,7 @@ pymongo==4.15.3
310310
# via
311311
# -r requirements/quality.txt
312312
# edx-opaque-keys
313-
pynacl==1.6.0
313+
pynacl==1.6.1
314314
# via
315315
# -r requirements/quality.txt
316316
# edx-django-utils
@@ -323,7 +323,7 @@ pyproject-hooks==1.2.0
323323
# -r requirements/pip-tools.txt
324324
# build
325325
# pip-tools
326-
pytest==8.4.2
326+
pytest==9.0.0
327327
# via
328328
# -r requirements/quality.txt
329329
# pytest-cov
@@ -341,7 +341,7 @@ python-slugify==8.0.4
341341
# via
342342
# -r requirements/quality.txt
343343
# code-annotations
344-
pytokens==0.2.0
344+
pytokens==0.3.0
345345
# via
346346
# -r requirements/quality.txt
347347
# black
@@ -357,7 +357,7 @@ pyyaml==6.0.3
357357
# responses
358358
# superset-api-client
359359
# xblock
360-
redis==6.4.0
360+
redis==7.0.1
361361
# via -r requirements/quality.txt
362362
requests==2.32.5
363363
# via
@@ -406,7 +406,7 @@ tomlkit==0.13.3
406406
# via
407407
# -r requirements/quality.txt
408408
# pylint
409-
tox==4.31.0
409+
tox==4.32.0
410410
# via -r requirements/ci.txt
411411
typing-extensions==4.15.0
412412
# via
@@ -427,7 +427,7 @@ vine==5.1.0
427427
# amqp
428428
# celery
429429
# kombu
430-
virtualenv==20.35.3
430+
virtualenv==20.35.4
431431
# via
432432
# -r requirements/ci.txt
433433
# tox

requirements/doc.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ code-annotations==2.3.0
7474
# via
7575
# -r requirements/test.txt
7676
# edx-toggles
77-
coverage[toml]==7.11.0
77+
coverage[toml]==7.11.3
7878
# via
7979
# -r requirements/test.txt
8080
# pytest-cov
8181
cryptography==46.0.3
8282
# via secretstorage
8383
ddt==1.7.2
8484
# via -r requirements/test.txt
85-
django==4.2.25
85+
django==5.2.8
8686
# via
8787
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
8888
# -r requirements/test.txt
@@ -198,7 +198,7 @@ more-itertools==10.8.0
198198
# via
199199
# jaraco-classes
200200
# jaraco-functools
201-
nh3==0.3.1
201+
nh3==0.3.2
202202
# via readme-renderer
203203
oauthlib==3.3.1
204204
# via
@@ -228,7 +228,7 @@ prompt-toolkit==3.0.52
228228
# via
229229
# -r requirements/test.txt
230230
# click-repl
231-
psutil==7.1.1
231+
psutil==7.1.3
232232
# via
233233
# -r requirements/test.txt
234234
# edx-django-utils
@@ -252,13 +252,13 @@ pymongo==4.15.3
252252
# via
253253
# -r requirements/test.txt
254254
# edx-opaque-keys
255-
pynacl==1.6.0
255+
pynacl==1.6.1
256256
# via
257257
# -r requirements/test.txt
258258
# edx-django-utils
259259
pyproject-hooks==1.2.0
260260
# via build
261-
pytest==8.4.2
261+
pytest==9.0.0
262262
# via
263263
# -r requirements/test.txt
264264
# pytest-cov
@@ -289,7 +289,7 @@ pyyaml==6.0.3
289289
# xblock
290290
readme-renderer==44.0
291291
# via twine
292-
redis==6.4.0
292+
redis==7.0.1
293293
# via -r requirements/test.txt
294294
requests==2.32.5
295295
# via

requirements/pip.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ wheel==0.45.1
99

1010
# The following packages are considered to be unsafe in a requirements file:
1111
pip==25.2
12-
# via -r requirements/pip.in
12+
# via
13+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
14+
# -r requirements/pip.in
1315
setuptools==80.9.0
1416
# via -r requirements/pip.in

requirements/quality.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ billiard==4.2.2
2424
# via
2525
# -r requirements/test.txt
2626
# celery
27-
black==25.9.0
27+
black==25.11.0
2828
# via -r requirements/quality.in
2929
celery==5.5.3
3030
# via -r requirements/test.txt
@@ -71,15 +71,15 @@ code-annotations==2.3.0
7171
# -r requirements/test.txt
7272
# edx-lint
7373
# edx-toggles
74-
coverage[toml]==7.11.0
74+
coverage[toml]==7.11.3
7575
# via
7676
# -r requirements/test.txt
7777
# pytest-cov
7878
ddt==1.7.2
7979
# via -r requirements/test.txt
8080
dill==0.4.0
8181
# via pylint
82-
django==4.2.25
82+
django==5.2.8
8383
# via
8484
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
8585
# -r requirements/test.txt
@@ -200,7 +200,7 @@ prompt-toolkit==3.0.52
200200
# via
201201
# -r requirements/test.txt
202202
# click-repl
203-
psutil==7.1.1
203+
psutil==7.1.3
204204
# via
205205
# -r requirements/test.txt
206206
# edx-django-utils
@@ -234,11 +234,11 @@ pymongo==4.15.3
234234
# via
235235
# -r requirements/test.txt
236236
# edx-opaque-keys
237-
pynacl==1.6.0
237+
pynacl==1.6.1
238238
# via
239239
# -r requirements/test.txt
240240
# edx-django-utils
241-
pytest==8.4.2
241+
pytest==9.0.0
242242
# via
243243
# -r requirements/test.txt
244244
# pytest-cov
@@ -256,7 +256,7 @@ python-slugify==8.0.4
256256
# via
257257
# -r requirements/test.txt
258258
# code-annotations
259-
pytokens==0.2.0
259+
pytokens==0.3.0
260260
# via black
261261
pytz==2025.2
262262
# via
@@ -269,7 +269,7 @@ pyyaml==6.0.3
269269
# responses
270270
# superset-api-client
271271
# xblock
272-
redis==6.4.0
272+
redis==7.0.1
273273
# via -r requirements/test.txt
274274
requests==2.32.5
275275
# via

requirements/test.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ code-annotations==2.3.0
6060
# -r requirements/base.txt
6161
# -r requirements/test.in
6262
# edx-toggles
63-
coverage[toml]==7.11.0
63+
coverage[toml]==7.11.3
6464
# via pytest-cov
6565
ddt==1.7.2
6666
# via -r requirements/test.in
@@ -162,7 +162,7 @@ prompt-toolkit==3.0.52
162162
# via
163163
# -r requirements/base.txt
164164
# click-repl
165-
psutil==7.1.1
165+
psutil==7.1.3
166166
# via
167167
# -r requirements/base.txt
168168
# edx-django-utils
@@ -176,11 +176,11 @@ pymongo==4.15.3
176176
# via
177177
# -r requirements/base.txt
178178
# edx-opaque-keys
179-
pynacl==1.6.0
179+
pynacl==1.6.1
180180
# via
181181
# -r requirements/base.txt
182182
# edx-django-utils
183-
pytest==8.4.2
183+
pytest==9.0.0
184184
# via
185185
# pytest-cov
186186
# pytest-django
@@ -208,7 +208,7 @@ pyyaml==6.0.3
208208
# responses
209209
# superset-api-client
210210
# xblock
211-
redis==6.4.0
211+
redis==7.0.1
212212
# via -r requirements/base.txt
213213
requests==2.32.5
214214
# via

0 commit comments

Comments
 (0)