Skip to content

Commit 8b84f56

Browse files
authored
fix: make upgrade to reinstall pip before running pip-compile (#322)
1 parent 1bedd9f commit 8b84f56

9 files changed

Lines changed: 25 additions & 55 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ covreport: ## Show the coverage results
3434
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
3535
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
3636
pip install -q -r requirements/pip-tools.txt
37+
pip install -q -r requirements/pip.txt
3738
pip-compile --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in
3839
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
3940
pip install -q -r requirements/pip.txt

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ appdirs==1.4.4
88
# via fs
99
asgiref==3.10.0
1010
# via django
11-
django==4.2.25
11+
django==5.2.8
1212
# via
1313
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
1414
# -r requirements/base.in

requirements/ci.txt

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ binaryornot==0.4.4
2929
# via
3030
# -r requirements/test.txt
3131
# cookiecutter
32-
boto3==1.40.55
32+
boto3==1.40.68
3333
# via
3434
# -r requirements/test.txt
3535
# fs-s3fs
36-
botocore==1.40.55
36+
botocore==1.40.68
3737
# via
3838
# -r requirements/test.txt
3939
# boto3
@@ -46,10 +46,6 @@ certifi==2025.10.5
4646
# via
4747
# -r requirements/test.txt
4848
# requests
49-
cffi==2.0.0
50-
# via
51-
# -r requirements/test.txt
52-
# cryptography
5349
chardet==5.2.0
5450
# via
5551
# -r requirements/test.txt
@@ -83,16 +79,12 @@ cookiecutter==2.6.0
8379
# via
8480
# -r requirements/test.txt
8581
# xblock-sdk
86-
coverage[toml]==7.11.0
82+
coverage[toml]==7.11.1
8783
# via
8884
# -r requirements/test.txt
8985
# coveralls
9086
coveralls==4.0.1
9187
# via -r requirements/test.txt
92-
cryptography==46.0.3
93-
# via
94-
# -r requirements/test.txt
95-
# secretstorage
9688
ddt==1.7.2
9789
# via -r requirements/test.txt
9890
dill==0.4.0
@@ -103,7 +95,7 @@ distlib==0.4.0
10395
# via
10496
# -r requirements/tox.txt
10597
# virtualenv
106-
django==4.2.25
98+
django==5.2.8
10799
# via
108100
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
109101
# -r requirements/test.txt
@@ -112,7 +104,7 @@ docopt==0.6.2
112104
# via
113105
# -r requirements/test.txt
114106
# coveralls
115-
docutils==0.22.2
107+
docutils==0.22.3
116108
# via
117109
# -r requirements/test.txt
118110
# readme-renderer
@@ -164,11 +156,6 @@ jaraco-functools==4.3.0
164156
# via
165157
# -r requirements/test.txt
166158
# keyring
167-
jeepney==0.9.0
168-
# via
169-
# -r requirements/test.txt
170-
# keyring
171-
# secretstorage
172159
jinja2==3.1.6
173160
# via
174161
# -r requirements/test.txt
@@ -215,7 +202,7 @@ more-itertools==10.8.0
215202
# -r requirements/test.txt
216203
# jaraco-classes
217204
# jaraco-functools
218-
nh3==0.3.1
205+
nh3==0.3.2
219206
# via
220207
# -r requirements/test.txt
221208
# readme-renderer
@@ -240,10 +227,6 @@ pluggy==1.6.0
240227
# -r requirements/tox.txt
241228
# pytest
242229
# tox
243-
pycparser==2.23
244-
# via
245-
# -r requirements/test.txt
246-
# cffi
247230
pygments==2.19.2
248231
# via
249232
# -r requirements/test.txt
@@ -331,10 +314,6 @@ s3transfer==0.14.0
331314
# via
332315
# -r requirements/test.txt
333316
# boto3
334-
secretstorage==3.4.0
335-
# via
336-
# -r requirements/test.txt
337-
# keyring
338317
simplejson==3.20.2
339318
# via
340319
# -r requirements/test.txt
@@ -363,7 +342,7 @@ tomlkit==0.13.3
363342
# via
364343
# -r requirements/test.txt
365344
# pylint
366-
tox==4.31.0
345+
tox==4.32.0
367346
# via -r requirements/tox.txt
368347
twine==6.2.0
369348
# via -r requirements/test.txt
@@ -377,7 +356,7 @@ urllib3==2.5.0
377356
# botocore
378357
# requests
379358
# twine
380-
virtualenv==20.35.3
359+
virtualenv==20.35.4
381360
# via
382361
# -r requirements/tox.txt
383362
# tox

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ asgiref==3.10.0
1212
# via
1313
# -r requirements/base.txt
1414
# django
15-
django==4.2.25
15+
django==5.2.8
1616
# via
1717
# -r requirements/base.txt
1818
# edx-i18n-tools

requirements/docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ certifi==2025.10.5
2626
# via requests
2727
charset-normalizer==3.4.4
2828
# via requests
29-
django==4.2.25
29+
django==5.2.8
3030
# via -r requirements/base.txt
3131
docutils==0.21.2
3232
# 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/openedx/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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ astroid==3.3.11
2020
# pylint-celery
2121
binaryornot==0.4.4
2222
# via cookiecutter
23-
boto3==1.40.55
23+
boto3==1.40.68
2424
# via fs-s3fs
25-
botocore==1.40.55
25+
botocore==1.40.68
2626
# via
2727
# boto3
2828
# s3transfer
@@ -48,7 +48,7 @@ ddt==1.7.2
4848
# via -r requirements/quality.in
4949
dill==0.4.0
5050
# via pylint
51-
django==4.2.25
51+
django==5.2.8
5252
# via
5353
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
5454
# -r requirements/base.txt

requirements/test.txt

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ backports-tarfile==1.2.0
2222
# via jaraco-context
2323
binaryornot==0.4.4
2424
# via cookiecutter
25-
boto3==1.40.55
25+
boto3==1.40.68
2626
# via fs-s3fs
27-
botocore==1.40.55
27+
botocore==1.40.68
2828
# via
2929
# boto3
3030
# s3transfer
3131
certifi==2025.10.5
3232
# via requests
33-
cffi==2.0.0
34-
# via cryptography
3533
chardet==5.2.0
3634
# via binaryornot
3735
charset-normalizer==3.4.4
@@ -48,12 +46,10 @@ code-annotations==2.3.0
4846
# via edx-lint
4947
cookiecutter==2.6.0
5048
# via xblock-sdk
51-
coverage[toml]==7.11.0
49+
coverage[toml]==7.11.1
5250
# via coveralls
5351
coveralls==4.0.1
5452
# via -r requirements/test.in
55-
cryptography==46.0.3
56-
# via secretstorage
5753
ddt==1.7.2
5854
# via -r requirements/test.in
5955
dill==0.4.0
@@ -64,7 +60,7 @@ dill==0.4.0
6460
# xblock-sdk
6561
docopt==0.6.2
6662
# via coveralls
67-
docutils==0.22.2
63+
docutils==0.22.3
6864
# via readme-renderer
6965
edx-lint==5.6.0
7066
# via -r requirements/test.in
@@ -91,10 +87,6 @@ jaraco-context==6.0.1
9187
# via keyring
9288
jaraco-functools==4.3.0
9389
# via keyring
94-
jeepney==0.9.0
95-
# via
96-
# keyring
97-
# secretstorage
9890
jinja2==3.1.6
9991
# via
10092
# code-annotations
@@ -130,7 +122,7 @@ more-itertools==10.8.0
130122
# via
131123
# jaraco-classes
132124
# jaraco-functools
133-
nh3==0.3.1
125+
nh3==0.3.2
134126
# via readme-renderer
135127
packaging==25.0
136128
# via
@@ -140,8 +132,6 @@ platformdirs==4.5.0
140132
# via pylint
141133
pluggy==1.6.0
142134
# via pytest
143-
pycparser==2.23
144-
# via cffi
145135
pygments==2.19.2
146136
# via
147137
# pytest
@@ -205,8 +195,6 @@ rich==14.2.0
205195
# twine
206196
s3transfer==0.14.0
207197
# via boto3
208-
secretstorage==3.4.0
209-
# via keyring
210198
simplejson==3.20.2
211199
# via
212200
# -r requirements/base.txt

requirements/tox.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/tox.in
33-
virtualenv==20.35.3
33+
virtualenv==20.35.4
3434
# via tox

0 commit comments

Comments
 (0)