Skip to content

Commit

Permalink
Merge pull request #107 from openedx/jenkins/zshkoor/tox40-updates-15…
Browse files Browse the repository at this point in the history
…e9339

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Oct 26, 2023
2 parents 15e9339 + ef3dd49 commit 3d32cbf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
boto3==1.28.62
boto3==1.28.68
# via fs-s3fs
botocore==1.31.62
botocore==1.31.68
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -69,7 +69,7 @@ sqlparse==0.4.4
# via django
typing-extensions==4.8.0
# via asgiref
urllib3==1.26.17
urllib3==1.26.18
# via botocore
web-fragments==2.1.0
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
certifi==2023.7.22
# via requests
charset-normalizer==3.3.0
charset-normalizer==3.3.1
# via requests
coverage==6.5.0
# via coveralls
Expand Down Expand Up @@ -55,7 +55,7 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.txt
urllib3==2.0.6
urllib3==2.0.7
# via requests
virtualenv==20.24.5
# via
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
13 changes: 7 additions & 6 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
astroid==3.0.0
astroid==3.0.1
# via pylint
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 Down Expand Up @@ -83,9 +83,9 @@ pbr==5.11.1
# stevedore
platformdirs==3.11.0
# via pylint
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
pylint==3.0.1
pylint==3.0.2
# via -r requirements/quality.in
pymongo==3.13.0
# via
Expand Down Expand Up @@ -140,7 +140,7 @@ typing-extensions==4.8.0
# astroid
# edx-opaque-keys
# pylint
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements/base.txt
# botocore
Expand All @@ -156,6 +156,7 @@ webob==1.8.7
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ deps =
skip_install = True

[testenv:csslint]
whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
commands =
make requirements_js
Expand All @@ -28,7 +28,7 @@ deps =
skip_install = True

[testenv:eslint]
whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
commands =
make requirements_js
Expand Down

0 comments on commit 3d32cbf

Please sign in to comment.