Skip to content

Commit 42c2d2f

Browse files
AgrendalathAgrendalath
authored
Merge pull request #357 from open-craft/jenkins/upgrade-python-requirements-bf0d5a0
Python Requirements Update
2 parents bf0d5a0 + 1ed09c3 commit 42c2d2f

File tree

9 files changed

+56
-37
lines changed

9 files changed

+56
-37
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ requirements_python: piptools ## install all requirements locally
8686
pip-sync requirements/dev.txt requirements/private.*
8787

8888
# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
89-
PIP_COMPILE = pip-compile --upgrade --resolver=backtracking $(PIP_COMPILE_OPTS)
89+
PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS)
9090

9191
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
9292
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in

‎requirements/base.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ appdirs==1.4.4
99
asgiref==3.7.2
1010
# via django
1111
django==3.2.20
12-
# via -r requirements/base.in
12+
# via
13+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
14+
# -r requirements/base.in
1315
edx-opaque-keys==2.3.0
1416
# via -r requirements/base.in
1517
fs==2.4.16

‎requirements/ci.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ filelock==3.12.2
1212
# virtualenv
1313
packaging==23.1
1414
# via tox
15-
platformdirs==3.8.1
15+
platformdirs==3.9.1
1616
# via virtualenv
1717
pluggy==1.2.0
1818
# via tox
@@ -24,9 +24,10 @@ tomli==2.0.1
2424
# via tox
2525
tox==3.28.0
2626
# via
27+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
2728
# -r requirements/ci.in
2829
# tox-battery
2930
tox-battery==0.6.1
3031
# via -r requirements/ci.in
31-
virtualenv==20.23.1
32+
virtualenv==20.24.0
3233
# via tox

‎requirements/dev.txt

+21-10
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ binaryornot==0.4.4
3030
# -r requirements/workbench.txt
3131
# cookiecutter
3232
bok-choy==0.7.1
33-
# via -r requirements/workbench.txt
34-
boto3==1.28.1
33+
# via
34+
# -c requirements/constraints.txt
35+
# -r requirements/workbench.txt
36+
boto3==1.28.3
3537
# via
3638
# -r requirements/quality.txt
3739
# -r requirements/workbench.txt
3840
# fs-s3fs
39-
botocore==1.31.1
41+
botocore==1.31.3
4042
# via
4143
# -r requirements/quality.txt
4244
# -r requirements/workbench.txt
@@ -61,9 +63,10 @@ charset-normalizer==3.2.0
6163
# -r requirements/quality.txt
6264
# -r requirements/workbench.txt
6365
# requests
64-
click==8.1.4
66+
click==8.1.5
6567
# via
6668
# -r requirements/pip-tools.txt
69+
# -r requirements/quality.txt
6770
# -r requirements/workbench.txt
6871
# click-log
6972
# code-annotations
@@ -79,7 +82,7 @@ code-annotations==1.3.0
7982
# -r requirements/quality.txt
8083
# -r requirements/workbench.txt
8184
# edx-lint
82-
cookiecutter==2.2.0
85+
cookiecutter==2.2.3
8386
# via
8487
# -r requirements/quality.txt
8588
# -r requirements/workbench.txt
@@ -103,6 +106,7 @@ distlib==0.3.6
103106
# virtualenv
104107
django==3.2.20
105108
# via
109+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
106110
# -r requirements/quality.txt
107111
# -r requirements/workbench.txt
108112
# django-appconf
@@ -210,7 +214,7 @@ mccabe==0.7.0
210214
# via
211215
# -r requirements/quality.txt
212216
# pylint
213-
mock==5.0.2
217+
mock==5.1.0
214218
# via
215219
# -r requirements/quality.txt
216220
# -r requirements/workbench.txt
@@ -224,14 +228,16 @@ nose==1.3.7
224228
# via
225229
# -r requirements/workbench.txt
226230
# needle
227-
openedx-django-pyfs==3.3.0
231+
openedx-django-pyfs==3.4.0
228232
# via
229233
# -r requirements/quality.txt
230234
# -r requirements/workbench.txt
231235
# xblock
232236
packaging==23.1
233237
# via
238+
# -r requirements/ci.txt
234239
# -r requirements/pip-tools.txt
240+
# -r requirements/quality.txt
235241
# -r requirements/workbench.txt
236242
# build
237243
# pytest
@@ -250,16 +256,17 @@ pillow==10.0.0
250256
# via
251257
# -r requirements/workbench.txt
252258
# needle
253-
pip-tools==6.14.0
259+
pip-tools==7.0.0
254260
# via -r requirements/pip-tools.txt
255-
platformdirs==3.8.1
261+
platformdirs==3.9.1
256262
# via
257263
# -r requirements/ci.txt
258264
# -r requirements/quality.txt
259265
# pylint
260266
# virtualenv
261267
pluggy==1.2.0
262268
# via
269+
# -r requirements/ci.txt
263270
# -r requirements/quality.txt
264271
# -r requirements/workbench.txt
265272
# pytest
@@ -376,6 +383,7 @@ simplejson==3.19.1
376383
# xblock-utils
377384
six==1.16.0
378385
# via
386+
# -r requirements/ci.txt
379387
# -r requirements/quality.txt
380388
# -r requirements/workbench.txt
381389
# bok-choy
@@ -406,7 +414,9 @@ text-unidecode==1.3
406414
# python-slugify
407415
tomli==2.0.1
408416
# via
417+
# -r requirements/ci.txt
409418
# -r requirements/pip-tools.txt
419+
# -r requirements/quality.txt
410420
# -r requirements/workbench.txt
411421
# build
412422
# coverage
@@ -421,6 +431,7 @@ tomlkit==0.11.8
421431
# pylint
422432
tox==3.28.0
423433
# via
434+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
424435
# -r requirements/ci.txt
425436
# tox-battery
426437
tox-battery==0.6.1
@@ -439,7 +450,7 @@ urllib3==1.26.16
439450
# botocore
440451
# requests
441452
# selenium
442-
virtualenv==20.23.1
453+
virtualenv==20.24.0
443454
# via
444455
# -r requirements/ci.txt
445456
# tox

‎requirements/pip-tools.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
build==0.10.0
88
# via pip-tools
9-
click==8.1.4
9+
click==8.1.5
1010
# via pip-tools
1111
packaging==23.1
1212
# via build
13-
pip-tools==6.14.0
13+
pip-tools==7.0.0
1414
# via -r requirements/pip-tools.in
1515
pyproject-hooks==1.0.0
1616
# via build

‎requirements/pip.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wheel==0.40.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
11-
pip==23.1.2
11+
pip==23.2
1212
# via -r requirements/pip.in
1313
setuptools==68.0.0
1414
# via -r requirements/pip.in

‎requirements/quality.txt

+8-7
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ binaryornot==0.4.4
2424
# via
2525
# -r requirements/test.txt
2626
# cookiecutter
27-
boto3==1.28.1
27+
boto3==1.28.3
2828
# via
2929
# -r requirements/test.txt
3030
# fs-s3fs
31-
botocore==1.31.1
31+
botocore==1.31.3
3232
# via
3333
# -r requirements/test.txt
3434
# boto3
@@ -45,7 +45,7 @@ charset-normalizer==3.2.0
4545
# via
4646
# -r requirements/test.txt
4747
# requests
48-
click==8.1.4
48+
click==8.1.5
4949
# via
5050
# -r requirements/test.txt
5151
# click-log
@@ -58,7 +58,7 @@ code-annotations==1.3.0
5858
# via
5959
# -r requirements/test.txt
6060
# edx-lint
61-
cookiecutter==2.2.0
61+
cookiecutter==2.2.3
6262
# via
6363
# -r requirements/test.txt
6464
# xblock-sdk
@@ -72,6 +72,7 @@ dill==0.3.6
7272
# via pylint
7373
django==3.2.20
7474
# via
75+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
7576
# -r requirements/test.txt
7677
# django-appconf
7778
# django-statici18n
@@ -150,9 +151,9 @@ markupsafe==2.1.3
150151
# xblock
151152
mccabe==0.7.0
152153
# via pylint
153-
mock==5.0.2
154+
mock==5.1.0
154155
# via -r requirements/test.txt
155-
openedx-django-pyfs==3.3.0
156+
openedx-django-pyfs==3.4.0
156157
# via
157158
# -r requirements/test.txt
158159
# xblock
@@ -168,7 +169,7 @@ pbr==5.11.1
168169
# via
169170
# -r requirements/test.txt
170171
# stevedore
171-
platformdirs==3.8.1
172+
platformdirs==3.9.1
172173
# via pylint
173174
pluggy==1.2.0
174175
# via

‎requirements/test.txt

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ asgiref==3.7.2
1616
# django
1717
binaryornot==0.4.4
1818
# via cookiecutter
19-
boto3==1.28.1
19+
boto3==1.28.3
2020
# via fs-s3fs
21-
botocore==1.31.1
21+
botocore==1.31.3
2222
# via
2323
# boto3
2424
# s3transfer
@@ -28,19 +28,20 @@ chardet==5.1.0
2828
# via binaryornot
2929
charset-normalizer==3.2.0
3030
# via requests
31-
click==8.1.4
31+
click==8.1.5
3232
# via
3333
# code-annotations
3434
# cookiecutter
3535
code-annotations==1.3.0
3636
# via -r requirements/test.in
37-
cookiecutter==2.2.0
37+
cookiecutter==2.2.3
3838
# via xblock-sdk
3939
coverage[toml]==7.2.7
4040
# via pytest-cov
4141
ddt==1.6.0
4242
# via -r requirements/test.in
4343
# via
44+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
4445
# -r requirements/base.txt
4546
# django-appconf
4647
# django-statici18n
@@ -96,9 +97,9 @@ markupsafe==2.1.3
9697
# jinja2
9798
# mako
9899
# xblock
99-
mock==5.0.2
100+
mock==5.1.0
100101
# via -r requirements/test.in
101-
openedx-django-pyfs==3.3.0
102+
openedx-django-pyfs==3.4.0
102103
# via xblock
103104
packaging==23.1
104105
# via pytest

‎requirements/workbench.txt

+10-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ binaryornot==0.4.4
2121
# -r requirements/test.txt
2222
# cookiecutter
2323
bok-choy==0.7.1
24-
# via -r requirements/workbench.in
25-
boto3==1.28.1
24+
# via
25+
# -c requirements/constraints.txt
26+
# -r requirements/workbench.in
27+
boto3==1.28.3
2628
# via
2729
# -r requirements/test.txt
2830
# fs-s3fs
29-
botocore==1.31.1
31+
botocore==1.31.3
3032
# via
3133
# -r requirements/test.txt
3234
# boto3
@@ -43,14 +45,14 @@ charset-normalizer==3.2.0
4345
# via
4446
# -r requirements/test.txt
4547
# requests
46-
click==8.1.4
48+
click==8.1.5
4749
# via
4850
# -r requirements/test.txt
4951
# code-annotations
5052
# cookiecutter
5153
code-annotations==1.3.0
5254
# via -r requirements/test.txt
53-
cookiecutter==2.2.0
55+
cookiecutter==2.2.3
5456
# via
5557
# -r requirements/test.txt
5658
# xblock-sdk
@@ -62,6 +64,7 @@ ddt==1.6.0
6264
# via -r requirements/test.txt
6365
django==3.2.20
6466
# via
67+
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
6568
# -r requirements/test.txt
6669
# django-appconf
6770
# django-statici18n
@@ -133,15 +136,15 @@ markupsafe==2.1.3
133136
# jinja2
134137
# mako
135138
# xblock
136-
mock==5.0.2
139+
mock==5.1.0
137140
# via -r requirements/test.txt
138141
mysqlclient==2.2.0
139142
# via -r requirements/workbench.in
140143
needle==0.5.0
141144
# via bok-choy
142145
nose==1.3.7
143146
# via needle
144-
openedx-django-pyfs==3.3.0
147+
openedx-django-pyfs==3.4.0
145148
# via
146149
# -r requirements/test.txt
147150
# xblock

0 commit comments

Comments
 (0)