Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove tox-battery package and tox constraint #243

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
# via virtualenv
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
# via
# pyproject-api
# tox
platformdirs==4.1.0
# via virtualenv
# via
# tox
# virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.in
# pyproject-api
# tox
tox==4.11.4
# via -r requirements/ci.in
virtualenv==20.25.0
# via tox
4 changes: 0 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@

diff-cover # Changeset diff test coverage
edx-i18n-tools # For i18n_tool dummy
tox-battery # Makes tox aware of requirements file changes
58 changes: 22 additions & 36 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,19 @@ build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.2
# via
# -r requirements/ci.txt
# tox
certifi==2023.11.17
# via
# -r requirements/quality.txt
# requests
cffi==1.16.0
# via
# -r requirements/quality.txt
# cryptography
chardet==5.2.0
# via diff-cover
# via
# -r requirements/ci.txt
# diff-cover
# tox
charset-normalizer==3.3.2
# via
# -r requirements/quality.txt
Expand All @@ -47,15 +50,15 @@ code-annotations==1.5.0
# via
# -r requirements/quality.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.3.2
# via
# -r requirements/quality.txt
# coverage
# pytest-cov
cryptography==41.0.7
# via
# -r requirements/quality.txt
# secretstorage
diff-cover==8.0.1
# via -r requirements/dev.in
dill==0.3.7
Expand Down Expand Up @@ -127,11 +130,6 @@ jaraco-classes==3.3.0
# via
# -r requirements/quality.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/quality.txt
# keyring
# secretstorage
jinja2==3.1.2
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -163,7 +161,7 @@ more-itertools==10.1.0
# via
# -r requirements/quality.txt
# jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via
# -r requirements/quality.txt
# readme-renderer
Expand All @@ -174,6 +172,7 @@ packaging==23.2
# -r requirements/quality.txt
# build
# drf-yasg
# pyproject-api
# pytest
# tox
path==16.9.0
Expand All @@ -193,6 +192,7 @@ platformdirs==4.1.0
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
# tox
# virtualenv
pluggy==1.3.0
# via
Expand All @@ -203,16 +203,8 @@ pluggy==1.3.0
# tox
polib==1.2.0
# via edx-i18n-tools
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.1
# via -r requirements/quality.txt
pycparser==2.21
# via
# -r requirements/quality.txt
# cffi
pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.17.2
Expand Down Expand Up @@ -241,6 +233,10 @@ pylint-plugin-utils==0.8.2
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pyproject-api==1.6.1
# via
# -r requirements/ci.txt
# tox
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -291,16 +287,10 @@ rich==13.7.0
# via
# -r requirements/quality.txt
# twine
secretstorage==3.3.3
# via
# -r requirements/quality.txt
# keyring
six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# edx-lint
# tox
snowballstemmer==2.2.0
# via
# -r requirements/quality.txt
Expand All @@ -326,20 +316,16 @@ tomli==2.0.1
# coverage
# pip-tools
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.3
# via
# -r requirements/quality.txt
# pylint
tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.2
# via -r requirements/dev.in
tox==4.11.4
# via -r requirements/ci.txt
twine==4.0.2
# via -r requirements/quality.txt
typing-extensions==4.8.0
Expand Down
14 changes: 1 addition & 13 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@ beautifulsoup4==4.12.2
# via pydata-sphinx-theme
certifi==2023.11.17
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==41.0.7
# via secretstorage
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
Expand Down Expand Up @@ -77,10 +73,6 @@ iniconfig==2.0.0
# pytest
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via sphinx
keyring==24.3.0
Expand All @@ -93,7 +85,7 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
packaging==23.2
# via
Expand All @@ -110,8 +102,6 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
pycparser==2.21
# via cffi
pydata-sphinx-theme==0.14.4
# via sphinx-book-theme
pygments==2.17.2
Expand Down Expand Up @@ -159,8 +149,6 @@ rfc3986==2.0.0
# via twine
rich==13.7.0
# via twine
secretstorage==3.3.3
# via keyring
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
Expand Down
14 changes: 1 addition & 13 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ astroid==3.0.1
# pylint-celery
certifi==2023.11.17
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
click==8.1.7
Expand All @@ -32,8 +30,6 @@ coverage[toml]==7.3.2
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==41.0.7
# via secretstorage
dill==0.3.7
# via pylint
django==3.2.23
Expand Down Expand Up @@ -78,10 +74,6 @@ isort==5.12.0
# pylint
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via code-annotations
keyring==24.3.0
Expand All @@ -96,7 +88,7 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
packaging==23.2
# via
Expand All @@ -115,8 +107,6 @@ pluggy==1.3.0
# pytest
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
pydocstyle==6.3.0
# via -r requirements/quality.in
pygments==2.17.2
Expand Down Expand Up @@ -171,8 +161,6 @@ rfc3986==2.0.0
# via twine
rich==13.7.0
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via edx-lint
snowballstemmer==2.2.0
Expand Down