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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 26, 2023
Merged

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ backports-zoneinfo[tzdata]==0.2.1
# kombu
billiard==4.1.0
# via celery
boto3==1.28.62
boto3==1.28.68
# via fs-s3fs
botocore==1.31.62
botocore==1.31.68
# via
# boto3
# s3transfer
Expand All @@ -28,7 +28,7 @@ certifi==2023.7.22
# via requests
cffi==1.16.0
# via pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand Down Expand Up @@ -110,7 +110,7 @@ markupsafe==2.1.3
# via
# mako
# xblock
newrelic==9.1.0
newrelic==9.1.1
# via edx-django-utils
openedx-django-pyfs==3.4.0
# via xblock
Expand All @@ -122,7 +122,7 @@ pbr==5.11.1
# via stevedore
prompt-toolkit==3.0.39
# via click-repl
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand Down Expand Up @@ -177,7 +177,7 @@ tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==1.26.17
urllib3==1.26.18
# via
# botocore
# requests
Expand Down
27 changes: 13 additions & 14 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
backports-zoneinfo[tzdata]==0.2.1
# via
# -r requirements/base.txt
# backports-zoneinfo
# celery
# kombu
billiard==4.1.0
# via
# -r requirements/base.txt
# celery
boto3==1.28.62
boto3==1.28.68
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.62
botocore==1.31.68
# via
# -r requirements/base.txt
# boto3
Expand All @@ -52,7 +53,7 @@ cffi==1.16.0
# via
# -r requirements/base.txt
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via
# -r requirements/base.txt
# requests
Expand Down Expand Up @@ -85,7 +86,9 @@ click-repl==0.3.0
code-annotations==1.5.0
# via edx-lint
coverage[toml]==7.3.2
# via pytest-cov
# via
# coverage
# pytest-cov
dill==0.3.7
# via pylint
distlib==0.3.7
Expand Down Expand Up @@ -201,8 +204,6 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lazy-object-proxy==1.9.0
# via astroid
lxml==4.9.3
# via
# -r requirements/base.txt
Expand All @@ -225,7 +226,7 @@ markupsafe==2.1.3
# xblock
mccabe==0.7.0
# via pylint
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down Expand Up @@ -270,7 +271,7 @@ prompt-toolkit==3.0.39
# via
# -r requirements/base.txt
# click-repl
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -282,15 +283,15 @@ pycparser==2.21
# via
# -r requirements/base.txt
# cffi
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 @@ -405,7 +406,7 @@ tzdata==2023.3
# -r requirements/base.txt
# backports-zoneinfo
# celery
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/base.txt
# botocore
Expand Down Expand Up @@ -436,8 +437,6 @@ webob==1.8.7
# xblock
wheel==0.41.2
# via pip-tools
wrapt==1.15.0
# via astroid
xblock[django]==1.8.1
# via
# -r requirements/base.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Open in desktop
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
28 changes: 14 additions & 14 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
backports-zoneinfo[tzdata]==0.2.1
# via
# -r requirements/base.txt
# backports-zoneinfo
# celery
# kombu
billiard==4.1.0
# via
# -r requirements/base.txt
# celery
boto3==1.28.62
boto3==1.28.68
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.31.62
botocore==1.31.68
# via
# -r requirements/base.txt
# boto3
Expand All @@ -50,7 +51,7 @@ cffi==1.16.0
# via
# -r requirements/base.txt
# pynacl
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via
# -r requirements/base.txt
# requests
Expand Down Expand Up @@ -82,7 +83,9 @@ click-repl==0.3.0
code-annotations==1.5.0
# via edx-lint
coverage[toml]==7.3.2
# via pytest-cov
# via
# coverage
# pytest-cov
dill==0.3.7
# via pylint
django==3.2.22
Expand Down Expand Up @@ -177,8 +180,6 @@ lazy==1.6
# via
# -r requirements/base.txt
# xblock
lazy-object-proxy==1.9.0
# via astroid
lxml==4.9.3
# via
# -r requirements/base.txt
Expand All @@ -198,7 +199,7 @@ markupsafe==2.1.3
# xblock
mccabe==0.7.0
# via pylint
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down Expand Up @@ -226,23 +227,23 @@ prompt-toolkit==3.0.39
# via
# -r requirements/base.txt
# click-repl
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/base.txt
# edx-django-utils
pycparser==2.21
# via
# -r requirements/base.txt
# cffi
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 @@ -341,7 +342,7 @@ tzdata==2023.3
# -r requirements/base.txt
# backports-zoneinfo
# celery
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/base.txt
# botocore
Expand All @@ -365,11 +366,10 @@ webob==1.8.7
# via
# -r requirements/base.txt
# xblock
wrapt==1.15.0
# via astroid
xblock[django]==1.8.1
# via
# -r requirements/base.txt
# xblock
# xblock-utils
xblock-utils==4.0.0
# via -r requirements/base.txt
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
envlist = django{32,42}, quality

[testenv]
whitelist_externals =
allowlist_externals =
make
deps =
django32: Django>=3.2,<4.0
Expand All @@ -12,7 +12,7 @@ commands =
make test

[testenv:quality]
whitelist_externals =
allowlist_externals =
make
deps =
-r{toxinidir}/requirements/test.txt
Expand Down