Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #149 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 Oct 31, 2023
2 parents 67c208c + 2466898 commit 357042e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 23 deletions.
7 changes: 4 additions & 3 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.2.5
# Generated by edx-lint version: 5.3.6
# ------------------------------
[MASTER]
ignore = ,migrations
Expand Down Expand Up @@ -259,6 +259,7 @@ enable =
useless-suppression,
disable =
bad-indentation,
broad-exception-raised,
consider-using-f-string,
duplicate-code,
file-ignored,
Expand Down Expand Up @@ -381,6 +382,6 @@ ext-import-graph =
int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception

# 277587d1653a70fa8c900f74c6cd5892538385f1
# 23c1c712481e8e036bee6d71fbec535bcd2c2cc1
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

codecov # Code coverage reporting
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
3 changes: 0 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,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
urllib3==2.0.6
# via requests
virtualenv==20.24.5
Expand Down
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ diff-cover # Changeset diff test coverage
edx-lint # For updating pylintrc
edx-i18n-tools # For i18n_tool dummy
tox # virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
twine # Utility for PyPI package uploads
wheel # For generation of wheels for PyPI
15 changes: 1 addition & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ caniusepython3==7.3.0
certifi==2023.7.22
# via requests
cffi==1.16.0
# via
# cryptography
# pynacl
# via pynacl
chardet==5.2.0
# via diff-cover
charset-normalizer==3.3.0
Expand All @@ -34,8 +32,6 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
cryptography==41.0.4
# via secretstorage
diff-cover==7.7.0
# via -r requirements/dev.in
dill==0.3.7
Expand Down Expand Up @@ -90,10 +86,6 @@ isort==5.12.0
# pylint
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via
# code-annotations
Expand Down Expand Up @@ -192,8 +184,6 @@ rfc3986==2.0.0
# via twine
rich==13.6.0
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# edx-lint
Expand All @@ -218,9 +208,6 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/dev.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/dev.in
typing-extensions==4.8.0
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 =
setenv =
DJANGO_SETTINGS_MODULE=test_settings
PYTHONPATH = .
whitelist_externals =
allowlist_externals =
make
rm
touch
Expand Down

0 comments on commit 357042e

Please sign in to comment.