Skip to content

Commit d0a13a3

Browse files
bmtcrilTycho Hob
bmtcril
and
Tycho Hob
authored
chore: Fix and run make upgrade (#207)
Removes a no longer needed click pin, which cascaded a series of dependency issues. Co-authored-by: Tycho Hob <[email protected]>
1 parent 6ca9b90 commit d0a13a3

9 files changed

Lines changed: 48 additions & 54 deletions

File tree

‎requirements/base.txt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ cffi==2.0.0
1818
# pynacl
1919
charset-normalizer==3.4.3
2020
# via requests
21-
click==8.3.0
22-
# via
23-
# -c requirements/constraints.txt
24-
# edx-django-utils
21+
click==8.3.1
22+
# via edx-django-utils
2523
cryptography==46.0.2
2624
# via pyjwt
2725
django==4.2.24
@@ -56,7 +54,7 @@ drf-jwt==1.19.2
5654
# via edx-drf-extensions
5755
drf-yasg==1.21.11
5856
# via edx-api-doc-tools
59-
edx-api-doc-tools==2.1.0
57+
edx-api-doc-tools==2.1.2
6058
# via -r requirements/base.in
6159
edx-django-utils==8.0.1
6260
# via
@@ -74,7 +72,7 @@ inflection==0.5.1
7472
# via drf-yasg
7573
openedx-atlas==0.7.0
7674
# via -r requirements/base.in
77-
packaging==25.0
75+
packaging==26.0
7876
# via drf-yasg
7977
psutil==7.1.0
8078
# via edx-django-utils

‎requirements/ci.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@
44
#
55
# pip-compile --output-file=requirements/ci.txt requirements/ci.in
66
#
7-
cachetools==6.2.0
7+
cachetools==6.2.6
88
# via tox
99
chardet==5.2.0
1010
# via tox
1111
colorama==0.4.6
1212
# via tox
1313
distlib==0.4.0
1414
# via virtualenv
15-
filelock==3.19.1
15+
filelock==3.20.3
1616
# via
1717
# tox
1818
# virtualenv
19-
packaging==25.0
19+
packaging==26.0
2020
# via
2121
# pyproject-api
2222
# tox
23-
platformdirs==4.4.0
23+
platformdirs==4.5.1
2424
# via
2525
# tox
2626
# virtualenv
2727
pluggy==1.6.0
2828
# via tox
29-
pyproject-api==1.9.1
29+
pyproject-api==1.10.0
3030
# via tox
31-
tox==4.30.2
31+
tox==4.34.1
3232
# via -r requirements/ci.in
33-
virtualenv==20.34.0
33+
virtualenv==20.36.1
3434
# via tox

‎requirements/constraints.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@
1010

1111
# Common constraints for edx repos
1212
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
13-
14-
# Different packages want different versions of click, we force the most compatible one here
15-
click==8.3.0

‎requirements/dev.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ asgiref==3.9.1
88
# via
99
# -r requirements/quality.txt
1010
# django
11-
astroid==3.3.11
11+
astroid==4.0.3
1212
# via
1313
# -r requirements/quality.txt
1414
# pylint
@@ -19,7 +19,7 @@ build==1.4.0
1919
# via
2020
# -r requirements/pip-tools.txt
2121
# pip-tools
22-
cachetools==6.2.0
22+
cachetools==6.2.6
2323
# via
2424
# -r requirements/ci.txt
2525
# tox
@@ -43,9 +43,8 @@ charset-normalizer==3.4.3
4343
# via
4444
# -r requirements/quality.txt
4545
# requests
46-
click==8.3.0
46+
click==8.3.1
4747
# via
48-
# -c requirements/constraints.txt
4948
# -r requirements/pip-tools.txt
5049
# -r requirements/quality.txt
5150
# click-log
@@ -127,7 +126,7 @@ drf-yasg==1.21.11
127126
# via
128127
# -r requirements/quality.txt
129128
# edx-api-doc-tools
130-
edx-api-doc-tools==2.1.0
129+
edx-api-doc-tools==2.1.2
131130
# via -r requirements/quality.txt
132131
edx-django-utils==8.0.1
133132
# via
@@ -143,7 +142,7 @@ edx-opaque-keys==3.0.0
143142
# via
144143
# -r requirements/quality.txt
145144
# edx-drf-extensions
146-
filelock==3.19.1
145+
filelock==3.20.3
147146
# via
148147
# -r requirements/ci.txt
149148
# tox
@@ -185,7 +184,7 @@ mccabe==0.7.0
185184
# pylint
186185
openedx-atlas==0.7.0
187186
# via -r requirements/quality.txt
188-
packaging==25.0
187+
packaging==26.0
189188
# via
190189
# -r requirements/ci.txt
191190
# -r requirements/pip-tools.txt
@@ -195,11 +194,12 @@ packaging==25.0
195194
# pyproject-api
196195
# pytest
197196
# tox
197+
# wheel
198198
path==16.16.0
199199
# via edx-i18n-tools
200200
pip-tools==7.5.2
201201
# via -r requirements/pip-tools.txt
202-
platformdirs==4.4.0
202+
platformdirs==4.5.1
203203
# via
204204
# -r requirements/ci.txt
205205
# -r requirements/quality.txt
@@ -240,7 +240,7 @@ pyjwt[crypto]==2.10.1
240240
# -r requirements/quality.txt
241241
# drf-jwt
242242
# edx-drf-extensions
243-
pylint==3.3.8
243+
pylint==4.0.4
244244
# via
245245
# -r requirements/quality.txt
246246
# edx-lint
@@ -251,7 +251,7 @@ pylint-celery==0.3
251251
# via
252252
# -r requirements/quality.txt
253253
# edx-lint
254-
pylint-django==2.6.1
254+
pylint-django==2.7.0
255255
# via
256256
# -r requirements/quality.txt
257257
# edx-lint
@@ -268,7 +268,7 @@ pynacl==1.6.0
268268
# via
269269
# -r requirements/quality.txt
270270
# edx-django-utils
271-
pyproject-api==1.9.1
271+
pyproject-api==1.10.0
272272
# via
273273
# -r requirements/ci.txt
274274
# tox
@@ -340,7 +340,7 @@ tomlkit==0.13.3
340340
# via
341341
# -r requirements/quality.txt
342342
# pylint
343-
tox==4.30.2
343+
tox==4.34.1
344344
# via -r requirements/ci.txt
345345
typing-extensions==4.15.0
346346
# via
@@ -354,11 +354,11 @@ urllib3==2.5.0
354354
# via
355355
# -r requirements/quality.txt
356356
# requests
357-
virtualenv==20.34.0
357+
virtualenv==20.36.1
358358
# via
359359
# -r requirements/ci.txt
360360
# tox
361-
wheel==0.45.1
361+
wheel==0.46.3
362362
# via
363363
# -r requirements/pip-tools.txt
364364
# pip-tools

‎requirements/doc.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ charset-normalizer==3.4.3
3939
# via
4040
# -r requirements/test.txt
4141
# requests
42-
click==8.3.0
42+
click==8.3.1
4343
# via
44-
# -c requirements/constraints.txt
4544
# -r requirements/test.txt
4645
# code-annotations
4746
# edx-django-utils
@@ -108,7 +107,7 @@ drf-yasg==1.21.11
108107
# via
109108
# -r requirements/test.txt
110109
# edx-api-doc-tools
111-
edx-api-doc-tools==2.1.0
110+
edx-api-doc-tools==2.1.2
112111
# via -r requirements/test.txt
113112
edx-django-utils==8.0.1
114113
# via
@@ -171,7 +170,7 @@ nh3==0.3.0
171170
# via readme-renderer
172171
openedx-atlas==0.7.0
173172
# via -r requirements/test.txt
174-
packaging==25.0
173+
packaging==26.0
175174
# via
176175
# -r requirements/test.txt
177176
# build

‎requirements/pip-tools.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
#
77
build==1.4.0
88
# via pip-tools
9-
click==8.3.0
9+
click==8.3.1
10+
# via pip-tools
11+
packaging==26.0
1012
# via
11-
# -c requirements/constraints.txt
12-
# pip-tools
13-
packaging==25.0
14-
# via build
13+
# build
14+
# wheel
1515
pip-tools==7.5.2
1616
# via -r requirements/pip-tools.in
1717
pyproject-hooks==1.2.0
1818
# via
1919
# build
2020
# pip-tools
21-
wheel==0.45.1
21+
wheel==0.46.3
2222
# via pip-tools
2323

2424
# The following packages are considered to be unsafe in a requirements file:

‎requirements/pip.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in
66
#
7-
wheel==0.45.1
7+
packaging==26.0
8+
# via wheel
9+
wheel==0.46.3
810
# via -r requirements/pip.in
911

1012
# The following packages are considered to be unsafe in a requirements file:
1113
pip==25.3
1214
# via -r requirements/pip.in
13-
setuptools==80.9.0
15+
setuptools==80.10.2
1416
# via -r requirements/pip.in

‎requirements/quality.txt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ asgiref==3.9.1
88
# via
99
# -r requirements/test.txt
1010
# django
11-
astroid==3.3.11
11+
astroid==4.0.3
1212
# via
1313
# pylint
1414
# pylint-celery
@@ -29,9 +29,8 @@ charset-normalizer==3.4.3
2929
# via
3030
# -r requirements/test.txt
3131
# requests
32-
click==8.3.0
32+
click==8.3.1
3333
# via
34-
# -c requirements/constraints.txt
3534
# -r requirements/test.txt
3635
# click-log
3736
# code-annotations
@@ -96,7 +95,7 @@ drf-yasg==1.21.11
9695
# via
9796
# -r requirements/test.txt
9897
# edx-api-doc-tools
99-
edx-api-doc-tools==2.1.0
98+
edx-api-doc-tools==2.1.2
10099
# via -r requirements/test.txt
101100
edx-django-utils==8.0.1
102101
# via
@@ -136,12 +135,12 @@ mccabe==0.7.0
136135
# via pylint
137136
openedx-atlas==0.7.0
138137
# via -r requirements/test.txt
139-
packaging==25.0
138+
packaging==26.0
140139
# via
141140
# -r requirements/test.txt
142141
# drf-yasg
143142
# pytest
144-
platformdirs==4.4.0
143+
platformdirs==4.5.1
145144
# via pylint
146145
pluggy==1.6.0
147146
# via
@@ -171,15 +170,15 @@ pyjwt[crypto]==2.10.1
171170
# -r requirements/test.txt
172171
# drf-jwt
173172
# edx-drf-extensions
174-
pylint==3.3.8
173+
pylint==4.0.4
175174
# via
176175
# edx-lint
177176
# pylint-celery
178177
# pylint-django
179178
# pylint-plugin-utils
180179
pylint-celery==0.3
181180
# via edx-lint
182-
pylint-django==2.6.1
181+
pylint-django==2.7.0
183182
# via edx-lint
184183
pylint-plugin-utils==0.9.0
185184
# via

‎requirements/test.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ charset-normalizer==3.4.3
2525
# via
2626
# -r requirements/base.txt
2727
# requests
28-
click==8.3.0
28+
click==8.3.1
2929
# via
30-
# -c requirements/constraints.txt
3130
# -r requirements/base.txt
3231
# code-annotations
3332
# edx-django-utils
@@ -81,7 +80,7 @@ drf-yasg==1.21.11
8180
# via
8281
# -r requirements/base.txt
8382
# edx-api-doc-tools
84-
edx-api-doc-tools==2.1.0
83+
edx-api-doc-tools==2.1.2
8584
# via -r requirements/base.txt
8685
edx-django-utils==8.0.1
8786
# via
@@ -109,7 +108,7 @@ markupsafe==3.0.2
109108
# via jinja2
110109
openedx-atlas==0.7.0
111110
# via -r requirements/base.txt
112-
packaging==25.0
111+
packaging==26.0
113112
# via
114113
# -r requirements/base.txt
115114
# drf-yasg

0 commit comments

Comments
 (0)