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: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery #311

Merged
merged 1 commit into from
Oct 30, 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
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ djangorestframework==3.14.0
# via -r requirements/base.in
edx-django-utils==5.7.0
# via -r requirements/base.in
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
pbr==5.11.1
# via stevedore
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand Down
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
tox-travis # Make tox understand travis environment vars.
3 changes: 0 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
# tox-travis
tox-battery==0.6.2
# via -r requirements/ci.in
tox-travis==0.13
# via -r requirements/ci.in
virtualenv==20.24.5
Expand Down
24 changes: 7 additions & 17 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ asgiref==3.7.2
# via
# -r requirements/quality.txt
# django
astroid==2.15.8
astroid==3.0.1
# via
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -41,6 +41,7 @@ code-annotations==1.5.0
coverage[toml]==7.3.2
# via
# -r requirements/quality.txt
# coverage
# pytest-cov
ddt==1.6.0
# via -r requirements/quality.txt
Expand Down Expand Up @@ -104,10 +105,6 @@ jinja2==3.1.2
# via
# -r requirements/quality.txt
# code-annotations
lazy-object-proxy==1.9.0
# via
# -r requirements/quality.txt
# astroid
lxml==4.9.3
# via edx-i18n-tools
markupsafe==2.1.3
Expand All @@ -118,7 +115,7 @@ mccabe==0.7.0
# via
# -r requirements/quality.txt
# pylint
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/quality.txt
# edx-django-utils
Expand Down Expand Up @@ -152,23 +149,23 @@ pluggy==1.3.0
# tox
polib==1.2.0
# via edx-i18n-tools
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/quality.txt
# edx-django-utils
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.0
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
pylint==2.17.7
pylint==3.0.2
# via
# -r requirements/quality.txt
# edx-lint
Expand All @@ -179,7 +176,7 @@ pylint-celery==0.3
# via
# -r requirements/quality.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -267,10 +264,7 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# tox-battery
# tox-travis
tox-battery==0.6.2
# via -r requirements/ci.txt
tox-travis==0.13
# via -r requirements/ci.txt
typing-extensions==4.8.0
Expand All @@ -287,10 +281,6 @@ wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.15.0
# via
# -r requirements/quality.txt
# astroid
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
Expand Down
9 changes: 5 additions & 4 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cffi==1.16.0
# -r requirements/test.txt
# cryptography
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -34,6 +34,7 @@ click==8.1.7
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==41.0.4
# via secretstorage
Expand Down Expand Up @@ -103,7 +104,7 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -125,7 +126,7 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/test.txt
# edx-django-utils
Expand Down Expand Up @@ -230,7 +231,7 @@ typing-extensions==4.8.0
# asgiref
# pydata-sphinx-theme
# rich
urllib3==2.0.6
urllib3==2.0.7
# via
# requests
# twine
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.41.2
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
pip==23.3.1
# via -r requirements/pip.in
setuptools==68.2.2
# via -r requirements/pip.in
17 changes: 7 additions & 10 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ asgiref==3.7.2
# via
# -r requirements/test.txt
# django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand All @@ -30,6 +30,7 @@ code-annotations==1.5.0
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
ddt==1.6.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -71,13 +72,11 @@ isort==5.12.0
# via pylint
jinja2==3.1.2
# via code-annotations
lazy-object-proxy==1.9.0
# via astroid
markupsafe==2.1.3
# via jinja2
mccabe==0.7.0
# via pylint
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -95,27 +94,27 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/test.txt
# edx-django-utils
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via
# -r requirements/test.txt
# cffi
pydocstyle==6.3.0
# via -r requirements/quality.in
pylint==2.17.7
pylint==3.0.2
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via edx-lint
pylint-plugin-utils==0.8.2
# via
Expand Down Expand Up @@ -179,5 +178,3 @@ typing-extensions==4.8.0
# asgiref
# astroid
# pylint
wrapt==1.15.0
# via astroid
8 changes: 5 additions & 3 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ click==8.1.7
# -r requirements/base.txt
# edx-django-utils
coverage[toml]==7.3.2
# via pytest-cov
# via
# coverage
# pytest-cov
ddt==1.6.0
# via -r requirements/test.in
# via
Expand All @@ -44,7 +46,7 @@ freezegun==1.2.2
# via -r requirements/test.in
iniconfig==2.0.0
# via pytest
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -56,7 +58,7 @@ pbr==5.11.1
# stevedore
pluggy==1.3.0
# via pytest
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ commands =
setenv =
DJANGO_SETTINGS_MODULE = test_settings
PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
whitelist_externals =
allowlist_externals =
make
rm
deps =
Expand All @@ -47,7 +47,7 @@ commands =
[testenv:quality]
setenv =
PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
whitelist_externals =
allowlist_externals =
make
rm
touch
Expand Down