Skip to content
This repository was archived by the owner on Apr 16, 2026. It is now read-only.

Commit 9d4b963

Browse files
authored
Merge pull request #130 from openedx/jenkins/zshkoor/tox40-updates-3367fb4
fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
2 parents 3367fb4 + 92c117a commit 9d4b963

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

requirements/base.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ appdirs==1.4.4
88
# via fs
99
asgiref==3.7.2
1010
# via django
11-
boto3==1.28.62
11+
boto3==1.28.68
1212
# via fs-s3fs
13-
botocore==1.31.62
13+
botocore==1.31.68
1414
# via
1515
# boto3
1616
# s3transfer
@@ -70,7 +70,7 @@ sqlparse==0.4.4
7070
# via django
7171
typing-extensions==4.8.0
7272
# via asgiref
73-
urllib3==1.26.17
73+
urllib3==1.26.18
7474
# via botocore
7575
web-fragments==2.1.0
7676
# via

requirements/ci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
certifi==2023.7.22
88
# via requests
9-
charset-normalizer==3.3.0
9+
charset-normalizer==3.3.1
1010
# via requests
1111
coverage==6.5.0
1212
# via coveralls
@@ -55,7 +55,7 @@ tox==3.28.0
5555
# via
5656
# -c requirements/common_constraints.txt
5757
# -r requirements/tox.txt
58-
urllib3==2.0.6
58+
urllib3==2.0.7
5959
# via requests
6060
virtualenv==20.24.5
6161
# via

requirements/pip.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wheel==0.41.2
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:
11-
pip==23.2.1
11+
pip==23.3.1
1212
# via -r requirements/pip.in
1313
setuptools==68.2.2
1414
# via -r requirements/pip.in

requirements/quality.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ asgiref==3.7.2
1212
# via
1313
# -r requirements/base.txt
1414
# django
15-
astroid==3.0.0
15+
astroid==3.0.1
1616
# via pylint
17-
boto3==1.28.62
17+
boto3==1.28.68
1818
# via
1919
# -r requirements/base.txt
2020
# fs-s3fs
21-
botocore==1.31.62
21+
botocore==1.31.68
2222
# via
2323
# -r requirements/base.txt
2424
# boto3
@@ -83,9 +83,9 @@ pbr==5.11.1
8383
# stevedore
8484
platformdirs==3.11.0
8585
# via pylint
86-
pycodestyle==2.11.0
86+
pycodestyle==2.11.1
8787
# via -r requirements/quality.in
88-
pylint==3.0.1
88+
pylint==3.0.2
8989
# via -r requirements/quality.in
9090
pymongo==3.13.0
9191
# via
@@ -140,7 +140,7 @@ typing-extensions==4.8.0
140140
# astroid
141141
# edx-opaque-keys
142142
# pylint
143-
urllib3==1.26.17
143+
urllib3==1.26.18
144144
# via
145145
# -r requirements/base.txt
146146
# botocore
@@ -156,6 +156,7 @@ webob==1.8.7
156156
xblock[django]==1.8.1
157157
# via
158158
# -r requirements/base.txt
159+
# xblock
159160
# xblock-utils
160161
xblock-utils==4.0.0
161162
# via -r requirements/base.txt

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ deps =
1919
skip_install = True
2020

2121
[testenv:csslint]
22-
whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
22+
allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
2323
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
2424
commands =
2525
{toxinidir}/node_modules/csslint/dist/cli.js submit_and_compare/public/
2626
deps =
2727
skip_install = True
2828

2929
[testenv:eslint]
30-
whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
30+
allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
3131
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
3232
commands =
3333
{toxinidir}/node_modules/eslint/bin/eslint.js --fix submit_and_compare/public/view.js

0 commit comments

Comments
 (0)