Skip to content

Commit

Permalink
Merge pull request #67 from openedx/zshkoor/tox-updates
Browse files Browse the repository at this point in the history
Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Nov 10, 2023
2 parents 7650b62 + 96d0ddd commit 450776a
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 13 deletions.
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@

coveralls # Code coverage reporting
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
edx-i18n-tools # Manage translation files, needed both for Travis and development
3 changes: 0 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
typing-extensions==4.8.0
# via asgiref
urllib3==2.0.7
Expand Down
3 changes: 0 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,6 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/travis.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/travis.in
transifex-client==0.14.4
# via -r requirements/dev.in
types-python-dateutil==2.8.19.14
Expand Down
1 change: 0 additions & 1 deletion requirements/travis.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@

coveralls # Code coverage reporting
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
edx-i18n-tools # Manage translation files, needed both for Travis and development
3 changes: 0 additions & 3 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/travis.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/travis.in
typing-extensions==4.8.0
# via asgiref
urllib3==2.0.7
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ addopts = --cov google_drive --cov-report term-missing --durations=10
norecursedirs = .* requirements

[testenv]
whitelist_externals =
allowlist_externals =
make
mkdir
rm
Expand All @@ -33,7 +33,7 @@ commands =
make validate_translations

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

0 comments on commit 450776a

Please sign in to comment.