Skip to content

Commit 4874407

Browse files
author
Feanil Patel
authored
Merge pull request #95 from ZiqiXiao/Ziqi-Xiao-patch-1
chore: Add tox<4.0.0 to constraints.txt
2 parents f73bf18 + 912c9fb commit 4874407

File tree

10 files changed

+251
-245
lines changed

10 files changed

+251
-245
lines changed

‎requirements/base.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.8
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
44
#
55
# make upgrade
66
#
7-
click==8.1.3
7+
click==8.1.7
88
# via -r requirements/base.in
99
jinja2==3.1.2
1010
# via -r requirements/base.in
11-
markupsafe==2.1.1
11+
markupsafe==2.1.3
1212
# via jinja2
13-
pbr==5.9.0
13+
pbr==5.11.1
1414
# via stevedore
15-
python-slugify==6.1.2
15+
python-slugify==8.0.1
1616
# via -r requirements/base.in
17-
pyyaml==6.0
17+
pyyaml==6.0.1
1818
# via -r requirements/base.in
19-
stevedore==3.5.0
19+
stevedore==5.1.0
2020
# via -r requirements/base.in
2121
text-unidecode==1.3
2222
# via python-slugify

‎requirements/ci.txt‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.8
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
44
#
55
# make upgrade
66
#
7-
distlib==0.3.4
7+
distlib==0.3.7
88
# via virtualenv
9-
filelock==3.7.1
9+
filelock==3.12.4
1010
# via
1111
# tox
1212
# virtualenv
13-
packaging==21.3
13+
packaging==23.2
1414
# via tox
15-
platformdirs==2.5.2
15+
platformdirs==3.11.0
1616
# via virtualenv
17-
pluggy==1.0.0
17+
pluggy==1.3.0
1818
# via tox
1919
py==1.11.0
2020
# via tox
21-
pyparsing==3.0.9
22-
# via packaging
2321
six==1.16.0
24-
# via
25-
# tox
26-
# virtualenv
27-
toml==0.10.2
2822
# via tox
29-
tox==3.25.0
23+
tomli==2.0.1
24+
# via tox
25+
tox==3.28.0
3026
# via
3127
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
28+
# -c requirements/constraints.txt
3229
# -r requirements/ci.in
3330
# tox-battery
34-
tox-battery==0.6.1
31+
tox-battery==0.6.2
3532
# via -r requirements/ci.in
36-
virtualenv==20.15.0
33+
virtualenv==20.24.6
3734
# via tox

‎requirements/constraints.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@
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+
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
15+
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
16+
tox<4.0.0

‎requirements/dev.txt‎

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
#
2-
# This file is autogenerated by pip-compile with python 3.8
3-
# To update, run:
2+
# This file is autogenerated by pip-compile with Python 3.8
3+
# by the following command:
44
#
55
# make upgrade
66
#
77
asgiref==3.7.2
88
# via
99
# -r requirements/quality.txt
1010
# django
11-
astroid==2.11.6
11+
astroid==3.0.1
1212
# via
1313
# -r requirements/quality.txt
1414
# pylint
1515
# pylint-celery
16-
attrs==21.4.0
16+
build==1.0.3
1717
# via
18-
# -r requirements/quality.txt
19-
# pytest
20-
chardet==5.0.0
18+
# -r requirements/pip-tools.txt
19+
# pip-tools
20+
chardet==5.2.0
2121
# via diff-cover
22-
click==8.1.3
22+
click==8.1.7
2323
# via
2424
# -r requirements/pip-tools.txt
2525
# -r requirements/quality.txt
@@ -31,40 +31,49 @@ click-log==0.4.0
3131
# via
3232
# -r requirements/quality.txt
3333
# edx-lint
34-
code-annotations==1.3.0
34+
code-annotations==1.5.0
3535
# via
3636
# -r requirements/quality.txt
3737
# edx-lint
38-
coverage[toml]==6.4.1
38+
coverage[toml]==7.3.2
3939
# via
4040
# -r requirements/quality.txt
41+
# coverage
4142
# pytest-cov
42-
diff-cover==6.5.1
43+
diff-cover==8.0.0
4344
# via -r requirements/dev.in
44-
dill==0.3.5.1
45+
dill==0.3.7
4546
# via
4647
# -r requirements/quality.txt
4748
# pylint
48-
distlib==0.3.4
49+
distlib==0.3.7
4950
# via
5051
# -r requirements/ci.txt
5152
# virtualenv
52-
django==3.2.13
53+
django==3.2.22
5354
# via
5455
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
5556
# -r requirements/quality.txt
56-
edx-lint==5.2.4
57+
edx-lint==5.3.6
5758
# via -r requirements/quality.txt
58-
filelock==3.7.1
59+
exceptiongroup==1.1.3
60+
# via
61+
# -r requirements/quality.txt
62+
# pytest
63+
filelock==3.12.4
5964
# via
6065
# -r requirements/ci.txt
6166
# tox
6267
# virtualenv
63-
iniconfig==1.1.1
68+
importlib-metadata==6.8.0
69+
# via
70+
# -r requirements/pip-tools.txt
71+
# build
72+
iniconfig==2.0.0
6473
# via
6574
# -r requirements/quality.txt
6675
# pytest
67-
isort==5.10.1
76+
isort==5.12.0
6877
# via
6978
# -r requirements/quality.txt
7079
# pylint
@@ -73,43 +82,37 @@ jinja2==3.1.2
7382
# -r requirements/quality.txt
7483
# code-annotations
7584
# diff-cover
76-
lazy-object-proxy==1.7.1
77-
# via
78-
# -r requirements/quality.txt
79-
# astroid
80-
markupsafe==2.1.1
85+
markupsafe==2.1.3
8186
# via
8287
# -r requirements/quality.txt
8388
# jinja2
8489
mccabe==0.7.0
8590
# via
8691
# -r requirements/quality.txt
8792
# pylint
88-
mock==4.0.3
93+
mock==5.1.0
8994
# via -r requirements/quality.txt
90-
packaging==21.3
95+
packaging==23.2
9196
# via
9297
# -r requirements/ci.txt
98+
# -r requirements/pip-tools.txt
9399
# -r requirements/quality.txt
100+
# build
94101
# pytest
95102
# tox
96-
pbr==5.9.0
103+
pbr==5.11.1
97104
# via
98105
# -r requirements/quality.txt
99106
# stevedore
100-
pep517==0.12.0
101-
# via
102-
# -r requirements/pip-tools.txt
103-
# pip-tools
104-
pip-tools==6.6.2
107+
pip-tools==7.3.0
105108
# via -r requirements/pip-tools.txt
106-
platformdirs==2.5.2
109+
platformdirs==3.11.0
107110
# via
108111
# -r requirements/ci.txt
109112
# -r requirements/quality.txt
110113
# pylint
111114
# virtualenv
112-
pluggy==1.0.0
115+
pluggy==1.3.0
113116
# via
114117
# -r requirements/ci.txt
115118
# -r requirements/quality.txt
@@ -119,16 +122,14 @@ pluggy==1.0.0
119122
py==1.11.0
120123
# via
121124
# -r requirements/ci.txt
122-
# -r requirements/quality.txt
123-
# pytest
124125
# tox
125-
pycodestyle==2.8.0
126+
pycodestyle==2.11.1
126127
# via -r requirements/quality.txt
127-
pydocstyle==6.1.1
128+
pydocstyle==6.3.0
128129
# via -r requirements/quality.txt
129-
pygments==2.12.0
130+
pygments==2.16.1
130131
# via diff-cover
131-
pylint==2.14.3
132+
pylint==3.0.2
132133
# via
133134
# -r requirements/quality.txt
134135
# edx-lint
@@ -139,35 +140,34 @@ pylint-celery==0.3
139140
# via
140141
# -r requirements/quality.txt
141142
# edx-lint
142-
pylint-django==2.5.3
143+
pylint-django==2.5.5
143144
# via
144145
# -r requirements/quality.txt
145146
# edx-lint
146-
pylint-plugin-utils==0.7
147+
pylint-plugin-utils==0.8.2
147148
# via
148149
# -r requirements/quality.txt
149150
# pylint-celery
150151
# pylint-django
151-
pyparsing==3.0.9
152+
pyproject-hooks==1.0.0
152153
# via
153-
# -r requirements/ci.txt
154-
# -r requirements/quality.txt
155-
# packaging
156-
pytest==7.1.2
154+
# -r requirements/pip-tools.txt
155+
# build
156+
pytest==7.4.3
157157
# via
158158
# -r requirements/quality.txt
159159
# pytest-cov
160-
pytest-cov==3.0.0
160+
pytest-cov==4.1.0
161161
# via -r requirements/quality.txt
162-
python-slugify==6.1.2
162+
python-slugify==8.0.1
163163
# via
164164
# -r requirements/quality.txt
165165
# code-annotations
166-
pytz==2022.1
166+
pytz==2023.3.post1
167167
# via
168168
# -r requirements/quality.txt
169169
# django
170-
pyyaml==6.0
170+
pyyaml==6.0.1
171171
# via
172172
# -r requirements/quality.txt
173173
# code-annotations
@@ -177,63 +177,64 @@ six==1.16.0
177177
# -r requirements/quality.txt
178178
# edx-lint
179179
# tox
180-
# virtualenv
181180
snowballstemmer==2.2.0
182181
# via
183182
# -r requirements/quality.txt
184183
# pydocstyle
185-
sqlparse==0.4.2
184+
sqlparse==0.4.4
186185
# via
187186
# -r requirements/quality.txt
188187
# django
189-
stevedore==3.5.0
188+
stevedore==5.1.0
190189
# via
191190
# -r requirements/quality.txt
192191
# code-annotations
193192
text-unidecode==1.3
194193
# via
195194
# -r requirements/quality.txt
196195
# python-slugify
197-
toml==0.10.2
198-
# via
199-
# -r requirements/ci.txt
200-
# tox
201196
tomli==2.0.1
202197
# via
198+
# -r requirements/ci.txt
203199
# -r requirements/pip-tools.txt
204200
# -r requirements/quality.txt
201+
# build
205202
# coverage
206-
# pep517
203+
# pip-tools
207204
# pylint
205+
# pyproject-hooks
208206
# pytest
209-
tomlkit==0.11.0
207+
# tox
208+
tomlkit==0.12.1
210209
# via
211210
# -r requirements/quality.txt
212211
# pylint
213-
tox==3.25.0
212+
tox==3.28.0
214213
# via
215214
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
215+
# -c requirements/constraints.txt
216216
# -r requirements/ci.txt
217217
# tox-battery
218-
tox-battery==0.6.1
218+
tox-battery==0.6.2
219219
# via -r requirements/ci.txt
220-
typing-extensions==4.2.0
220+
typing-extensions==4.8.0
221221
# via
222222
# -r requirements/quality.txt
223+
# asgiref
223224
# astroid
224225
# pylint
225-
virtualenv==20.15.0
226+
virtualenv==20.24.6
226227
# via
227228
# -r requirements/ci.txt
228229
# tox
229-
wheel==0.37.1
230+
wheel==0.41.2
230231
# via
231232
# -r requirements/pip-tools.txt
232233
# pip-tools
233-
wrapt==1.14.1
234+
zipp==3.17.0
234235
# via
235-
# -r requirements/quality.txt
236-
# astroid
236+
# -r requirements/pip-tools.txt
237+
# importlib-metadata
237238

238239
# The following packages are considered to be unsafe in a requirements file:
239240
# pip

0 commit comments

Comments
 (0)