Skip to content

Commit 764c306

Browse files
authored
Merge pull request #96 from openedx/remove-tox-battery-requirement
fix: remove tox-battery requirement
2 parents 9148d94 + 71f683c commit 764c306

File tree

11 files changed

+64
-66
lines changed

11 files changed

+64
-66
lines changed

.readthedocs.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: docs/conf.py
11+
12+
build:
13+
os: ubuntu-22.04
14+
tools:
15+
python: "3.8"
16+
17+
python:
18+
install:
19+
- requirements: requirements/doc.txt

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jinja2==3.1.2
1010
# via -r requirements/base.in
1111
markupsafe==2.1.3
1212
# via jinja2
13-
pbr==5.11.1
13+
pbr==6.0.0
1414
# via stevedore
1515
python-slugify==8.0.1
1616
# via -r requirements/base.in

requirements/ci.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
-c constraints.txt
44

55
tox # Virtualenv management for tests
6-
tox-battery # Makes tox aware of requirements file changes

requirements/ci.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#
77
distlib==0.3.7
88
# via virtualenv
9-
filelock==3.12.4
9+
filelock==3.13.1
1010
# via
1111
# tox
1212
# virtualenv
1313
packaging==23.2
1414
# via tox
15-
platformdirs==3.11.0
15+
platformdirs==4.1.0
1616
# via virtualenv
1717
pluggy==1.3.0
1818
# via tox
@@ -24,11 +24,7 @@ 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
2827
# -c requirements/constraints.txt
2928
# -r requirements/ci.in
30-
# tox-battery
31-
tox-battery==0.6.2
32-
# via -r requirements/ci.in
33-
virtualenv==20.24.6
29+
virtualenv==20.25.0
3430
# via tox

requirements/dev.txt

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ coverage[toml]==7.3.2
4040
# -r requirements/quality.txt
4141
# coverage
4242
# pytest-cov
43-
diff-cover==8.0.0
43+
diff-cover==8.0.1
4444
# via -r requirements/dev.in
4545
dill==0.3.7
4646
# via
@@ -50,22 +50,22 @@ distlib==0.3.7
5050
# via
5151
# -r requirements/ci.txt
5252
# virtualenv
53-
django==3.2.22
53+
django==3.2.23
5454
# via
5555
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
5656
# -r requirements/quality.txt
5757
edx-lint==5.3.6
5858
# via -r requirements/quality.txt
59-
exceptiongroup==1.1.3
59+
exceptiongroup==1.2.0
6060
# via
6161
# -r requirements/quality.txt
6262
# pytest
63-
filelock==3.12.4
63+
filelock==3.13.1
6464
# via
6565
# -r requirements/ci.txt
6666
# tox
6767
# virtualenv
68-
importlib-metadata==6.8.0
68+
importlib-metadata==7.0.0
6969
# via
7070
# -r requirements/pip-tools.txt
7171
# build
@@ -100,13 +100,13 @@ packaging==23.2
100100
# build
101101
# pytest
102102
# tox
103-
pbr==5.11.1
103+
pbr==6.0.0
104104
# via
105105
# -r requirements/quality.txt
106106
# stevedore
107107
pip-tools==7.3.0
108108
# via -r requirements/pip-tools.txt
109-
platformdirs==3.11.0
109+
platformdirs==4.1.0
110110
# via
111111
# -r requirements/ci.txt
112112
# -r requirements/quality.txt
@@ -127,7 +127,7 @@ pycodestyle==2.11.1
127127
# via -r requirements/quality.txt
128128
pydocstyle==6.3.0
129129
# via -r requirements/quality.txt
130-
pygments==2.16.1
130+
pygments==2.17.2
131131
# via diff-cover
132132
pylint==3.0.2
133133
# via
@@ -205,29 +205,25 @@ tomli==2.0.1
205205
# pyproject-hooks
206206
# pytest
207207
# tox
208-
tomlkit==0.12.1
208+
tomlkit==0.12.3
209209
# via
210210
# -r requirements/quality.txt
211211
# pylint
212212
tox==3.28.0
213213
# via
214-
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
215214
# -c requirements/constraints.txt
216215
# -r requirements/ci.txt
217-
# tox-battery
218-
tox-battery==0.6.2
219-
# via -r requirements/ci.txt
220216
typing-extensions==4.8.0
221217
# via
222218
# -r requirements/quality.txt
223219
# asgiref
224220
# astroid
225221
# pylint
226-
virtualenv==20.24.6
222+
virtualenv==20.25.0
227223
# via
228224
# -r requirements/ci.txt
229225
# tox
230-
wheel==0.41.2
226+
wheel==0.42.0
231227
# via
232228
# -r requirements/pip-tools.txt
233229
# pip-tools

requirements/django.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
asgiref==3.7.2
88
# via django
9-
django==3.2.22
9+
django==3.2.23
1010
# via
1111
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1212
# -r requirements/django.in

requirements/doc.txt

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ babel==2.13.1
1818
# sphinx
1919
beautifulsoup4==4.12.2
2020
# via pydata-sphinx-theme
21-
certifi==2023.7.22
21+
certifi==2023.11.17
2222
# via requests
23-
cffi==1.16.0
24-
# via cryptography
25-
charset-normalizer==3.3.1
23+
charset-normalizer==3.3.2
2624
# via requests
2725
click==8.1.7
2826
# via -r requirements/test.txt
@@ -31,9 +29,7 @@ coverage[toml]==7.3.2
3129
# -r requirements/test.txt
3230
# coverage
3331
# pytest-cov
34-
cryptography==41.0.5
35-
# via secretstorage
36-
django==3.2.22
32+
django==3.2.23
3733
# via
3834
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3935
# -r requirements/test.txt
@@ -46,36 +42,32 @@ docutils==0.19
4642
# readme-renderer
4743
# restructuredtext-lint
4844
# sphinx
49-
exceptiongroup==1.1.3
45+
exceptiongroup==1.2.0
5046
# via
5147
# -r requirements/test.txt
5248
# pytest
53-
idna==3.4
49+
idna==3.6
5450
# via requests
5551
imagesize==1.4.1
5652
# via sphinx
57-
importlib-metadata==6.8.0
53+
importlib-metadata==7.0.0
5854
# via
5955
# keyring
6056
# sphinx
6157
# twine
62-
importlib-resources==6.1.0
58+
importlib-resources==6.1.1
6359
# via keyring
6460
iniconfig==2.0.0
6561
# via
6662
# -r requirements/test.txt
6763
# pytest
6864
jaraco-classes==3.3.0
6965
# via keyring
70-
jeepney==0.8.0
71-
# via
72-
# keyring
73-
# secretstorage
7466
jinja2==3.1.2
7567
# via
7668
# -r requirements/test.txt
7769
# sphinx
78-
keyring==24.2.0
70+
keyring==24.3.0
7971
# via twine
8072
markdown-it-py==3.0.0
8173
# via rich
@@ -89,15 +81,15 @@ mock==5.1.0
8981
# via -r requirements/test.txt
9082
more-itertools==10.1.0
9183
# via jaraco-classes
92-
nh3==0.2.14
84+
nh3==0.2.15
9385
# via readme-renderer
9486
packaging==23.2
9587
# via
9688
# -r requirements/test.txt
9789
# pydata-sphinx-theme
9890
# pytest
9991
# sphinx
100-
pbr==5.11.1
92+
pbr==6.0.0
10193
# via
10294
# -r requirements/test.txt
10395
# stevedore
@@ -107,11 +99,9 @@ pluggy==1.3.0
10799
# via
108100
# -r requirements/test.txt
109101
# pytest
110-
pycparser==2.21
111-
# via cffi
112-
pydata-sphinx-theme==0.14.2
102+
pydata-sphinx-theme==0.14.4
113103
# via sphinx-book-theme
114-
pygments==2.16.1
104+
pygments==2.17.2
115105
# via
116106
# accessible-pygments
117107
# doc8
@@ -147,10 +137,8 @@ restructuredtext-lint==1.4.0
147137
# via doc8
148138
rfc3986==2.0.0
149139
# via twine
150-
rich==13.6.0
140+
rich==13.7.0
151141
# via twine
152-
secretstorage==3.3.3
153-
# via keyring
154142
snowballstemmer==2.2.0
155143
# via sphinx
156144
soupsieve==2.5
@@ -200,7 +188,7 @@ typing-extensions==4.8.0
200188
# asgiref
201189
# pydata-sphinx-theme
202190
# rich
203-
urllib3==2.0.7
191+
urllib3==2.1.0
204192
# via
205193
# requests
206194
# twine

requirements/pip-tools.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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
build==1.0.3
88
# via pip-tools
99
click==8.1.7
1010
# via pip-tools
11-
importlib-metadata==6.8.0
11+
importlib-metadata==7.0.0
1212
# via build
1313
packaging==23.2
1414
# via build
@@ -21,7 +21,7 @@ tomli==2.0.1
2121
# build
2222
# pip-tools
2323
# pyproject-hooks
24-
wheel==0.41.2
24+
wheel==0.42.0
2525
# via pip-tools
2626
zipp==3.17.0
2727
# via importlib-metadata

requirements/pip.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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-
wheel==0.41.2
7+
wheel==0.42.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
1111
pip==23.3.1
1212
# via -r requirements/pip.in
13-
setuptools==68.2.2
13+
setuptools==69.0.2
1414
# via -r requirements/pip.in

requirements/quality.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ coverage[toml]==7.3.2
2929
# pytest-cov
3030
dill==0.3.7
3131
# via pylint
32-
django==3.2.22
32+
django==3.2.23
3333
# via
3434
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
3535
# -r requirements/test.txt
3636
edx-lint==5.3.6
3737
# via -r requirements/quality.in
38-
exceptiongroup==1.1.3
38+
exceptiongroup==1.2.0
3939
# via
4040
# -r requirements/test.txt
4141
# pytest
@@ -63,11 +63,11 @@ packaging==23.2
6363
# via
6464
# -r requirements/test.txt
6565
# pytest
66-
pbr==5.11.1
66+
pbr==6.0.0
6767
# via
6868
# -r requirements/test.txt
6969
# stevedore
70-
platformdirs==3.11.0
70+
platformdirs==4.1.0
7171
# via pylint
7272
pluggy==1.3.0
7373
# via
@@ -131,7 +131,7 @@ tomli==2.0.1
131131
# coverage
132132
# pylint
133133
# pytest
134-
tomlkit==0.12.1
134+
tomlkit==0.12.3
135135
# via pylint
136136
typing-extensions==4.8.0
137137
# via

requirements/test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ coverage[toml]==7.3.2
1717
# via
1818
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
1919
# -r requirements/django.txt
20-
exceptiongroup==1.1.3
20+
exceptiongroup==1.2.0
2121
# via pytest
2222
iniconfig==2.0.0
2323
# via pytest
@@ -31,7 +31,7 @@ mock==5.1.0
3131
# via -r requirements/test.in
3232
packaging==23.2
3333
# via pytest
34-
pbr==5.11.1
34+
pbr==6.0.0
3535
# via
3636
# -r requirements/base.txt
3737
# stevedore

0 commit comments

Comments
 (0)