Skip to content

Commit

Permalink
Merge pull request #245 from openedx/jenkins/zshkoor/tox40-updates-fd…
Browse files Browse the repository at this point in the history 
…ed655

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
@UsamaSadiq
UsamaSadiq authored Oct 26, 2023
2 parents fded655 + 25c7ac7 commit bec3c27
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 41 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ frozenlist==1.4.0
# via
# aiohttp
# aiosignal
gitdb==4.0.10
gitdb==4.0.11
# via gitpython
github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f2935f48138b3c35cef6
# via -r requirements/github.in
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/base.in
idna==2.10
# via
Expand Down
1 change: 0 additions & 1 deletion requirements/ci.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
3 changes: 0 additions & 3 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.24.5
# via tox
24 changes: 7 additions & 17 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ aiosignal==1.3.1
# aiohttp
annotated-types==0.6.0
# via pydantic
astroid==2.15.8
astroid==3.0.1
# via
# -r requirements/quality.txt
# pylint
Expand Down Expand Up @@ -56,6 +56,7 @@ code-annotations==1.5.0
coverage[toml]==7.3.2
# via
# -r requirements/quality.txt
# coverage
# pytest-cov
diff-cover==4.1.1
# via
Expand Down Expand Up @@ -85,13 +86,13 @@ frozenlist==1.4.0
# -r requirements/quality.txt
# aiohttp
# aiosignal
gitdb==4.0.10
gitdb==4.0.11
# via
# -r requirements/quality.txt
# gitpython
github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f2935f48138b3c35cef6
# via -r requirements/quality.txt
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/quality.txt
idna==2.10
# via
Expand Down Expand Up @@ -121,10 +122,6 @@ jinja2==3.1.2
# jinja2-pluralize
jinja2-pluralize==0.3.0
# via diff-cover
lazy-object-proxy==1.9.0
# via
# -r requirements/quality.txt
# astroid
markupsafe==2.1.3
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -169,7 +166,7 @@ py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.txt
pydantic==2.4.2
# via inflect
Expand All @@ -179,7 +176,7 @@ pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.16.1
# via diff-cover
pylint==2.17.7
pylint==3.0.2
# via
# -r requirements/quality.txt
# edx-lint
Expand All @@ -190,7 +187,7 @@ pylint-celery==0.3
# via
# -r requirements/quality.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -267,9 +264,6 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.txt
typing-extensions==4.8.0
# via
# -r requirements/quality.txt
Expand All @@ -287,10 +281,6 @@ wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.15.0
# via
# -r requirements/quality.txt
# astroid
yarl==1.9.2
# via
# -r requirements/quality.txt
Expand Down
7 changes: 4 additions & 3 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ charset-normalizer==2.0.12
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
doc8==1.1.1
# via -r requirements/doc.in
Expand All @@ -61,13 +62,13 @@ frozenlist==1.4.0
# -r requirements/test.txt
# aiohttp
# aiosignal
gitdb==4.0.10
gitdb==4.0.11
# via
# -r requirements/test.txt
# gitpython
github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f2935f48138b3c35cef6
# via -r requirements/test.txt
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/test.txt
idna==2.10
# via
Expand Down Expand Up @@ -178,7 +179,7 @@ tomli==2.0.1
# pytest
typing-extensions==4.8.0
# via pydata-sphinx-theme
urllib3==2.0.6
urllib3==2.0.7
# via requests
yarl==1.9.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
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
17 changes: 7 additions & 10 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ aiosignal==1.3.1
# via
# -r requirements/test.txt
# aiohttp
astroid==2.15.8
astroid==3.0.1
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -42,6 +42,7 @@ code-annotations==1.5.0
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
dill==0.3.7
# via pylint
Expand All @@ -56,13 +57,13 @@ frozenlist==1.4.0
# -r requirements/test.txt
# aiohttp
# aiosignal
gitdb==4.0.10
gitdb==4.0.11
# via
# -r requirements/test.txt
# gitpython
github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f2935f48138b3c35cef6
# via -r requirements/test.txt
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/test.txt
idna==2.10
# via
Expand All @@ -79,8 +80,6 @@ isort==5.12.0
# pylint
jinja2==3.1.2
# via code-annotations
lazy-object-proxy==1.9.0
# via astroid
markupsafe==2.1.3
# via jinja2
mccabe==0.7.0
Expand All @@ -102,19 +101,19 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
pydocstyle==6.3.0
# via -r requirements/quality.in
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 @@ -164,8 +163,6 @@ typing-extensions==4.8.0
# via
# astroid
# pylint
wrapt==1.15.0
# via astroid
yarl==1.9.2
# via
# -r requirements/test.txt
Expand Down
8 changes: 5 additions & 3 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ charset-normalizer==2.0.12
# -r requirements/base.txt
# aiohttp
coverage[toml]==7.3.2
# via pytest-cov
# via
# coverage
# pytest-cov
exceptiongroup==1.1.3
# via
# -r requirements/base.txt
Expand All @@ -37,13 +39,13 @@ frozenlist==1.4.0
# -r requirements/base.txt
# aiohttp
# aiosignal
gitdb==4.0.10
gitdb==4.0.11
# via
# -r requirements/base.txt
# gitpython
github-py @ git+https://github.com/ShineyDev/github.py.git@8e3514010eb35a91e012f2935f48138b3c35cef6
# via -r requirements/base.txt
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/base.txt
idna==2.10
# via
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ commands =
[testenv:docs]
setenv =
PYTHONPATH = {toxinidir}
whitelist_externals =
allowlist_externals =
make
rm
deps =
Expand Down

0 comments on commit bec3c27

Please sign in to comment.