Skip to content

Commit

Permalink
Merge pull request #910 from openedx/jenkins/zshkoor/tox40-updates-32…
Browse files Browse the repository at this point in the history
…30bd6

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq committed Oct 26, 2023
2 parents 3230bd6 + 59df4f2 commit b5b24b8
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 51 deletions.
23 changes: 12 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,31 @@ backoff==2.2.1
# via -r requirements/base.in
backports-zoneinfo==0.2.1
# via django
boto3==1.28.54
boto3==1.28.68
# via -r requirements/base.in
botocore==1.31.54
botocore==1.31.68
# via
# boto3
# s3transfer
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via edx-django-utils
django==4.2.5
django==4.2.6
# via
# -r requirements/base.in
# django-crum
# django-storages
# django-waffle
# edx-django-release-util
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-storages==1.14
django-storages==1.14.2
# via -r requirements/base.in
django-waffle==4.0.0
# via edx-django-utils
Expand All @@ -53,17 +54,17 @@ jmespath==1.0.1
# botocore
mysqlclient==2.2.0
# via -r requirements/base.in
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/base.in
# edx-django-utils
packaging==23.1
packaging==23.2
# via gunicorn
path-py==11.0.1
# via -r requirements/base.in
pbr==5.11.1
# via stevedore
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand All @@ -81,7 +82,7 @@ pyyaml==6.0.1
# via edx-django-release-util
requests==2.31.0
# via -r requirements/base.in
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
six==1.16.0
# via
Expand All @@ -94,7 +95,7 @@ stevedore==5.1.0
# via edx-django-utils
typing-extensions==4.8.0
# via asgiref
urllib3==1.26.16
urllib3==1.26.18
# via
# botocore
# requests
Expand Down
1 change: 0 additions & 1 deletion requirements/ci.in
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
7 changes: 2 additions & 5 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ filelock==3.12.4
# via
# tox
# virtualenv
packaging==23.1
packaging==23.2
# via tox
platformdirs==3.10.0
platformdirs==3.11.0
# via virtualenv
pluggy==1.3.0
# via tox
Expand All @@ -26,8 +26,5 @@ 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
virtualenv==20.24.5
# via tox
32 changes: 15 additions & 17 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1
# via
# -r requirements/test.txt
# django
boto3==1.28.54
boto3==1.28.68
# via -r requirements/test.txt
botocore==1.31.54
botocore==1.31.68
# via
# -r requirements/test.txt
# boto3
Expand All @@ -29,11 +29,11 @@ certifi==2023.7.22
# via
# -r requirements/test.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/test.txt
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via
# -r requirements/test.txt
# requests
Expand All @@ -43,15 +43,16 @@ click==8.1.7
# -r requirements/test.txt
# edx-django-utils
# pip-tools
coverage[toml]==7.3.1
coverage[toml]==7.3.2
# via
# -r requirements/test.txt
# coverage
# pytest-cov
distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
django==4.2.5
django==4.2.6
# via
# -r requirements/test.txt
# django-crum
Expand All @@ -63,7 +64,7 @@ django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-storages==1.14
django-storages==1.14.2
# via -r requirements/test.txt
django-waffle==4.0.0
# via
Expand Down Expand Up @@ -105,11 +106,11 @@ jmespath==1.0.1
# botocore
mysqlclient==2.2.0
# via -r requirements/test.txt
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/test.txt
# edx-django-utils
packaging==23.1
packaging==23.2
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -126,7 +127,7 @@ pbr==5.11.1
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/ci.txt
# virtualenv
Expand All @@ -136,15 +137,15 @@ pluggy==1.3.0
# -r requirements/test.txt
# pytest
# tox
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/test.txt
# edx-django-utils
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.txt
pycparser==2.21
# via
Expand Down Expand Up @@ -185,7 +186,7 @@ pyyaml==6.0.1
# edx-django-release-util
requests==2.31.0
# via -r requirements/test.txt
s3transfer==0.6.2
s3transfer==0.7.0
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -220,14 +221,11 @@ tox==3.28.0
# via
# -c requirements/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/test.txt
# asgiref
urllib3==1.26.16
urllib3==1.26.18
# via
# -r requirements/test.txt
# botocore
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
# via build
packaging==23.1
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
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
2 changes: 1 addition & 1 deletion requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
#
# make upgrade
#
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/quality.in
26 changes: 14 additions & 12 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1
# via
# -r requirements/../requirements.txt
# django
boto3==1.28.54
boto3==1.28.68
# via -r requirements/../requirements.txt
botocore==1.31.54
botocore==1.31.68
# via
# -r requirements/../requirements.txt
# boto3
Expand All @@ -25,20 +25,22 @@ certifi==2023.7.22
# via
# -r requirements/../requirements.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/../requirements.txt
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via
# -r requirements/../requirements.txt
# requests
click==8.1.7
# via
# -r requirements/../requirements.txt
# edx-django-utils
coverage[toml]==7.3.1
# via pytest-cov
coverage[toml]==7.3.2
# via
# coverage
# pytest-cov
# via
# -r requirements/../requirements.txt
# django-crum
Expand All @@ -50,7 +52,7 @@ django-crum==0.7.9
# via
# -r requirements/../requirements.txt
# edx-django-utils
django-storages==1.14
django-storages==1.14.2
# via -r requirements/../requirements.txt
django-waffle==4.0.0
# via
Expand Down Expand Up @@ -79,11 +81,11 @@ jmespath==1.0.1
# botocore
mysqlclient==2.2.0
# via -r requirements/../requirements.txt
newrelic==9.1.0
newrelic==9.1.1
# via
# -r requirements/../requirements.txt
# edx-django-utils
packaging==23.1
packaging==23.2
# via
# -r requirements/../requirements.txt
# gunicorn
Expand All @@ -96,7 +98,7 @@ pbr==5.11.1
# stevedore
pluggy==1.3.0
# via pytest
psutil==5.9.5
psutil==5.9.6
# via
# -r requirements/../requirements.txt
# edx-django-utils
Expand Down Expand Up @@ -133,7 +135,7 @@ pyyaml==6.0.1
# edx-django-release-util
requests==2.31.0
# via -r requirements/../requirements.txt
s3transfer==0.6.2
s3transfer==0.7.0
# via
# -r requirements/../requirements.txt
# boto3
Expand All @@ -159,7 +161,7 @@ typing-extensions==4.8.0
# via
# -r requirements/../requirements.txt
# asgiref
urllib3==1.26.16
urllib3==1.26.18
# via
# -r requirements/../requirements.txt
# botocore
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ deps =
-r{toxinidir}/requirements/test.txt
passenv =
DB_HOST
whitelist_externals =
allowlist_externals =
make
commands =
make test

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

0 comments on commit b5b24b8

Please sign in to comment.