Skip to content

Commit 82a8276

Browse files
authored
Merge pull request #277 from openedx/feanil/fix_requirements_upgrades
build: Sync the pip and pip-tools text file.
2 parents 2df494c + 3c91d3a commit 82a8276

9 files changed

Lines changed: 25 additions & 45 deletions

File tree

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
2727
upgrade: $(COMMON_CONSTRAINTS_TXT)
2828
## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
2929
pip install -q -r requirements/pip_tools.txt
30-
pip-compile --allow-unsafe --rebuild --annotation-style=line --upgrade -o requirements/pip.txt requirements/pip.in
31-
pip-compile --annotation-style=line --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
32-
pip install -q -r requirements/pip.txt
30+
pip-compile --allow-unsafe --rebuild --annotation-style=line --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
3331
pip install -q -r requirements/pip_tools.txt
3432
pip-compile --annotation-style=line --upgrade -o requirements/tox.txt requirements/tox.in
3533
pip-compile --annotation-style=line --upgrade -o requirements/testing.txt requirements/testing.in

requirements/common_constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
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

requirements/development.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.10.0 # via -r requirements/testing.txt, django
8-
astroid==4.0.1 # via -r requirements/testing.txt, pylint
7+
asgiref==3.11.0 # via -r requirements/testing.txt, django
8+
astroid==4.0.2 # via -r requirements/testing.txt, pylint
99
dill==0.4.0 # via -r requirements/testing.txt, pylint
10-
django==4.2.25 # via -c requirements/common_constraints.txt, -r requirements/testing.txt
10+
django==5.2.9 # via -c requirements/common_constraints.txt, -r requirements/testing.txt
1111
iniconfig==2.3.0 # via -r requirements/testing.txt, pytest
1212
isort==7.0.0 # via -r requirements/testing.txt, pylint
1313
mccabe==0.7.0 # via -r requirements/testing.txt, pylint
1414
packaging==25.0 # via -r requirements/testing.txt, pytest
15-
platformdirs==4.5.0 # via -r requirements/testing.txt, pylint
15+
platformdirs==4.5.1 # via -r requirements/testing.txt, pylint
1616
pluggy==1.6.0 # via -r requirements/testing.txt, pytest
1717
pycodestyle==2.14.0 # via -r requirements/testing.txt
1818
pygments==2.19.2 # via -r requirements/testing.txt, pytest
19-
pylint==4.0.1 # via -r requirements/testing.txt
20-
pytest==8.4.2 # via -r requirements/testing.txt
21-
sqlparse==0.5.3 # via -r requirements/testing.txt, django
19+
pylint==4.0.4 # via -r requirements/testing.txt
20+
pytest==9.0.2 # via -r requirements/testing.txt
21+
sqlparse==0.5.5 # via -r requirements/testing.txt, django
2222
tomlkit==0.13.3 # via -r requirements/testing.txt, pylint

requirements/pip.in

Lines changed: 0 additions & 7 deletions
This file was deleted.

requirements/pip.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

requirements/pip_tools.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# make upgrade
66
#
77
build==1.3.0 # via pip-tools
8-
click==8.3.0 # via pip-tools
8+
click==8.3.1 # via pip-tools
99
packaging==25.0 # via build
10-
pip-tools==7.5.1 # via -r requirements/pip_tools.in
10+
pip-tools==7.5.2 # via -r requirements/pip_tools.in
1111
pyproject-hooks==1.2.0 # via build, pip-tools
1212
wheel==0.45.1 # via pip-tools
1313

1414
# The following packages are considered to be unsafe in a requirements file:
15-
# pip
16-
# setuptools
15+
pip==25.3 # via pip-tools
16+
setuptools==80.9.0 # via pip-tools

requirements/sandbox.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
#
55
# make upgrade
66
#
7-
numpy==2.3.4 # via -r requirements/sandbox.in
7+
numpy==2.4.0 # via -r requirements/sandbox.in
88
six==1.17.0 # via -r requirements/sandbox.in

requirements/testing.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
#
55
# make upgrade
66
#
7-
asgiref==3.10.0 # via django
8-
astroid==4.0.1 # via pylint
7+
asgiref==3.11.0 # via django
8+
astroid==4.0.2 # via pylint
99
dill==0.4.0 # via pylint
1010
iniconfig==2.3.0 # via pytest
1111
isort==7.0.0 # via -r requirements/testing.in, pylint
1212
mccabe==0.7.0 # via pylint
1313
packaging==25.0 # via pytest
14-
platformdirs==4.5.0 # via pylint
14+
platformdirs==4.5.1 # via pylint
1515
pluggy==1.6.0 # via pytest
1616
pycodestyle==2.14.0 # via -r requirements/testing.in
1717
pygments==2.19.2 # via pytest
18-
pylint==4.0.1 # via -r requirements/testing.in
19-
pytest==8.4.2 # via -r requirements/testing.in
20-
sqlparse==0.5.3 # via django
18+
pylint==4.0.4 # via -r requirements/testing.in
19+
pytest==9.0.2 # via -r requirements/testing.in
20+
sqlparse==0.5.5 # via django
2121
tomlkit==0.13.3 # via pylint

requirements/tox.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
#
55
# make upgrade
66
#
7-
cachetools==6.2.1 # via tox
7+
cachetools==6.2.4 # via tox
88
chardet==5.2.0 # via tox
99
colorama==0.4.6 # via tox
1010
distlib==0.4.0 # via virtualenv
11-
filelock==3.20.0 # via tox, virtualenv
11+
filelock==3.20.1 # via tox, virtualenv
1212
packaging==25.0 # via pyproject-api, tox
13-
platformdirs==4.5.0 # via tox, virtualenv
13+
platformdirs==4.5.1 # via tox, virtualenv
1414
pluggy==1.6.0 # via tox
1515
pyproject-api==1.10.0 # via tox
16-
tox==4.31.0 # via -r requirements/tox.in
17-
virtualenv==20.35.3 # via tox
16+
tox==4.32.0 # via -r requirements/tox.in
17+
virtualenv==20.35.4 # via tox

0 commit comments

Comments
 (0)