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 #400

Merged
merged 1 commit into from
Oct 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
-r ci.txt # dependencies needed to setup testing environment on CI

diff-cover # Changeset diff test coverage
tox-battery # Makes tox aware of requirements file changes
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.41.2
# via -r python-template/{{cookiecutter.placeholder_repo_name}}/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 python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in
setuptools==68.2.2
# via -r python-template/{{cookiecutter.placeholder_repo_name}}/requirements/pip.in
14 changes: 5 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
arrow==1.3.0
# via cookiecutter
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand All @@ -16,7 +16,7 @@ certifi==2023.7.22
# via requests
chardet==5.2.0
# via binaryornot
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -42,8 +42,6 @@ jinja2==3.1.2
# via
# code-annotations
# cookiecutter
lazy-object-proxy==1.9.0
# via astroid
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
Expand All @@ -58,15 +56,15 @@ platformdirs==3.11.0
# via pylint
pygments==2.16.1
# via rich
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.5
# via edx-lint
pylint-plugin-utils==0.8.2
# via
Expand Down Expand Up @@ -105,7 +103,5 @@ typing-extensions==4.8.0
# astroid
# pylint
# rich
urllib3==2.0.6
urllib3==2.0.7
# via requests
wrapt==1.15.0
# via astroid
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
-r test.txt # Dependencies for testing and quality checks
-r ci.txt # tox and associated dependencies

tox-battery # Makes tox aware of requirements file changes
23 changes: 6 additions & 17 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ asgiref==3.7.2
# via
# -r requirements/test.txt
# django
astroid==2.15.8
astroid==3.0.1
# via
# -r requirements/test.txt
# pylint
Expand Down Expand Up @@ -55,7 +55,7 @@ chardet==5.2.0
# via
# -r requirements/test.txt
# binaryornot
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via
# -r requirements/test.txt
# requests
Expand Down Expand Up @@ -172,10 +172,6 @@ keyring==24.2.0
# via
# -r requirements/test.txt
# twine
lazy-object-proxy==1.9.0
# via
# -r requirements/test.txt
# astroid
markdown-it-py==3.0.0
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -236,7 +232,7 @@ py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/test.txt
pycparser==2.21
# via
Expand All @@ -257,7 +253,7 @@ pygments==2.16.1
# readme-renderer
# rich
# sphinx
pylint==2.17.7
pylint==3.0.2
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -268,7 +264,7 @@ pylint-celery==0.3
# via
# -r requirements/test.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.5
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -428,9 +424,6 @@ 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-battery==0.6.2
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/test.txt
types-python-dateutil==2.8.19.14
Expand All @@ -445,7 +438,7 @@ typing-extensions==4.8.0
# pydata-sphinx-theme
# pylint
# rich
urllib3==2.0.6
urllib3==2.0.7
# via
# -r requirements/test.txt
# requests
Expand All @@ -459,10 +452,6 @@ wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.15.0
# via
# -r requirements/test.txt
# astroid
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
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
20 changes: 6 additions & 14 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ arrow==1.3.0
# cookiecutter
asgiref==3.7.2
# via django
astroid==2.15.8
astroid==3.0.1
# via
# -r requirements/base.txt
# pylint
Expand All @@ -41,7 +41,7 @@ chardet==5.2.0
# via
# -r requirements/base.txt
# binaryornot
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via
# -r requirements/base.txt
# requests
Expand Down Expand Up @@ -134,10 +134,6 @@ jinja2==3.1.2
# sphinx
keyring==24.2.0
# via twine
lazy-object-proxy==1.9.0
# via
# -r requirements/base.txt
# astroid
markdown-it-py==3.0.0
# via
# -r requirements/base.txt
Expand Down Expand Up @@ -177,7 +173,7 @@ platformdirs==3.11.0
# virtualenv
pluggy==1.3.0
# via pytest
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/test.in
pycparser==2.21
# via cffi
Expand All @@ -194,7 +190,7 @@ pygments==2.16.1
# readme-renderer
# rich
# sphinx
pylint==2.17.7
pylint==3.0.2
# via
# -r requirements/base.txt
# edx-lint
Expand All @@ -205,7 +201,7 @@ pylint-celery==0.3
# via
# -r requirements/base.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.5
# via
# -r requirements/base.txt
# edx-lint
Expand Down Expand Up @@ -334,17 +330,13 @@ typing-extensions==4.8.0
# pydata-sphinx-theme
# pylint
# rich
urllib3==2.0.6
urllib3==2.0.7
# via
# -r requirements/base.txt
# requests
# twine
virtualenv==20.24.5
# via -r requirements/test.in
wrapt==1.15.0
# via
# -r requirements/base.txt
# astroid
zipp==3.17.0
# via
# importlib-metadata
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ commands =
pytest {posargs}

[testenv:quality]
whitelist_externals =
allowlist_externals =
make
commands =
make quality