Skip to content

Commit 4c8ea79

Browse files
Ty Hobregisb
authored andcommitted
chore: Fix and run make upgrade
1 parent b9421ef commit 4c8ea79

File tree

9 files changed

+29
-20
lines changed

9 files changed

+29
-20
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $(COMMON_CONSTRAINTS_TXT):
4545
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
4646
upgrade: $(COMMON_CONSTRAINTS_TXT) # update the requirements/*.txt files with the latest packages satisfying requirements/*.in
4747
pip install -qr requirements/pip-tools.txt
48-
# Make sure to compile files after any other files they include!
48+
pip install -qr requirements/pip.txt
4949
pip-compile --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in
5050
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
5151
pip install -qr requirements/pip.txt

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/common_constraints.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@
1212
# this file from Github directly. It does not require packaging in edx-lint.
1313

1414
# using LTS django version
15-
Django<5.0
15+
Django<6.0
1616

1717
# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
1818
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
1919
# See https://github.com/openedx/edx-platform/issues/35126 for more info
2020
elasticsearch<7.14.0
21+
22+
# pip 25.3 is incompatible with pip-tools hence causing failures during the build process
23+
# Make upgrade command and all requirements upgrade jobs are broken due to this.
24+
# See issue https://github.com/openedx/public-engineering/issues/440 for details regarding the ongoing fix.
25+
# The constraint can be removed once a release (pip-tools > 7.5.1) is available with support for pip 25.3
26+
# Issue to track this dependency and unpin later on: https://github.com/openedx/edx-lint/issues/503
27+
pip<25.3

requirements/dev.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ colorama==0.4.6
4646
# via
4747
# -r requirements/ci.txt
4848
# tox
49-
coverage[toml]==7.11.0
49+
coverage[toml]==7.11.3
5050
# via
5151
# -r requirements/quality.txt
5252
# pytest-cov
@@ -60,7 +60,7 @@ distlib==0.4.0
6060
# via
6161
# -r requirements/ci.txt
6262
# virtualenv
63-
django==4.2.25
63+
django==5.2.8
6464
# via
6565
# -c requirements/common_constraints.txt
6666
# -r requirements/quality.txt
@@ -158,7 +158,7 @@ pyproject-hooks==1.2.0
158158
# -r requirements/pip-tools.txt
159159
# build
160160
# pip-tools
161-
pytest==8.4.2
161+
pytest==9.0.0
162162
# via
163163
# -r requirements/quality.txt
164164
# pytest-cov
@@ -196,9 +196,9 @@ tomlkit==0.13.3
196196
# via
197197
# -r requirements/quality.txt
198198
# pylint
199-
tox==4.31.0
199+
tox==4.32.0
200200
# via -r requirements/ci.txt
201-
virtualenv==20.35.3
201+
virtualenv==20.35.4
202202
# via
203203
# -r requirements/ci.txt
204204
# tox

requirements/django.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
asgiref==3.10.0
88
# via django
9-
django==4.2.25
9+
django==5.2.8
1010
# via
1111
# -c requirements/common_constraints.txt
1212
# -r requirements/django.in

requirements/doc.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ charset-normalizer==3.4.4
2828
# via requests
2929
click==8.3.0
3030
# via -r requirements/test.txt
31-
coverage[toml]==7.11.0
31+
coverage[toml]==7.11.3
3232
# via
3333
# -r requirements/test.txt
3434
# pytest-cov
3535
cryptography==46.0.3
3636
# via secretstorage
37-
django==4.2.25
37+
django==5.2.8
3838
# via
3939
# -c requirements/common_constraints.txt
4040
# -r requirements/test.txt
@@ -89,7 +89,7 @@ more-itertools==10.8.0
8989
# via
9090
# jaraco-classes
9191
# jaraco-functools
92-
nh3==0.3.1
92+
nh3==0.3.2
9393
# via readme-renderer
9494
packaging==25.0
9595
# via
@@ -117,7 +117,7 @@ pygments==2.19.2
117117
# readme-renderer
118118
# rich
119119
# sphinx
120-
pytest==8.4.2
120+
pytest==9.0.0
121121
# via
122122
# -r requirements/test.txt
123123
# pytest-cov

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 requirements/common_constraints.txt
14+
# -r requirements/pip.in
1315
setuptools==80.9.0
1416
# via -r requirements/pip.in

requirements/quality.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ click-log==0.4.0
2222
# via edx-lint
2323
code-annotations==2.3.0
2424
# via edx-lint
25-
coverage[toml]==7.11.0
25+
coverage[toml]==7.11.3
2626
# via
2727
# -r requirements/test.txt
2828
# pytest-cov
2929
dill==0.4.0
3030
# via pylint
31-
django==4.2.25
31+
django==5.2.8
3232
# via
3333
# -c requirements/common_constraints.txt
3434
# -r requirements/test.txt
@@ -87,7 +87,7 @@ pylint-plugin-utils==0.9.0
8787
# via
8888
# pylint-celery
8989
# pylint-django
90-
pytest==8.4.2
90+
pytest==9.0.0
9191
# via
9292
# -r requirements/test.txt
9393
# pytest-cov

requirements/test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ asgiref==3.10.0
1010
# django
1111
click==8.3.0
1212
# via -r requirements/base.txt
13-
coverage[toml]==7.11.0
13+
coverage[toml]==7.11.3
1414
# via pytest-cov
1515
# via
1616
# -c requirements/common_constraints.txt
@@ -33,7 +33,7 @@ pluggy==1.6.0
3333
# pytest-cov
3434
pygments==2.19.2
3535
# via pytest
36-
pytest==8.4.2
36+
pytest==9.0.0
3737
# via pytest-cov
3838
pytest-cov==7.0.0
3939
# via -r requirements/test.in

0 commit comments

Comments
 (0)