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

Commit

Permalink
Merge pull request #709 from openedx/jenkins/zshkoor/tox40-updates-ef…
Browse files Browse the repository at this point in the history
…4de4a

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Oct 26, 2023
2 parents ef4de4a + 31ce0b7 commit 2d2811e
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 47 deletions.
42 changes: 22 additions & 20 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ backoff==2.2.1
# via -r requirements/base.in
beautifulsoup4==4.12.2
# via cloudflare
boto3==1.28.53
boto3==1.28.68
# via -r requirements/base.in
botocore==1.31.53
botocore==1.31.68
# via
# boto3
# s3transfer
Expand All @@ -26,11 +26,11 @@ certifi==2023.7.22
# via
# kubernetes
# requests
cffi==1.15.1
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -47,7 +47,7 @@ cryptography==41.0.4
# simple-salesforce
deprecated==1.2.14
# via pygithub
django==3.2.21
django==3.2.22
# via
# -c requirements/constraints.txt
# django-crum
Expand All @@ -63,29 +63,29 @@ edx-django-utils==5.7.0
# via edx-rest-api-client
edx-opaque-keys==2.5.1
# via -r requirements/base.in
edx-rest-api-client==5.6.0
edx-rest-api-client==5.6.1
# via -r requirements/base.in
freezegun==1.2.2
# via -r requirements/base.in
gitdb==4.0.10
gitdb==4.0.11
# via gitpython
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/base.in
google-api-core==2.12.0
# via google-api-python-client
google-api-python-client==1.12.11
# via
# -c requirements/constraints.txt
# -r requirements/base.in
google-auth==2.23.0
google-auth==2.23.3
# via
# google-api-core
# google-api-python-client
# google-auth-httplib2
# kubernetes
google-auth-httplib2==0.1.1
# via google-api-python-client
googleapis-common-protos==1.60.0
googleapis-common-protos==1.61.0
# via google-api-core
httplib2==0.22.0
# via
Expand Down Expand Up @@ -113,7 +113,7 @@ markupsafe==2.1.3
# via jinja2
more-itertools==10.1.0
# via simple-salesforce
newrelic==9.0.0
newrelic==9.1.1
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -123,13 +123,13 @@ pbr==5.11.1
# via stevedore
pendulum==2.1.2
# via simple-salesforce
platformdirs==3.10.0
platformdirs==3.11.0
# via zeep
protobuf==4.24.3
protobuf==4.24.4
# via
# google-api-core
# googleapis-common-protos
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pyasn1==0.5.0
# via
Expand All @@ -139,7 +139,7 @@ pyasn1-modules==0.3.0
# via google-auth
pycparser==2.21
# via cffi
pygithub==1.59.1
pygithub==2.1.1
# via -r requirements/base.in
pyjwt[crypto]==2.8.0
# via
Expand All @@ -162,6 +162,7 @@ python-dateutil==2.8.2
# freezegun
# kubernetes
# pendulum
# pygithub
pytz==2023.3.post1
# via
# -r requirements/base.in
Expand Down Expand Up @@ -200,13 +201,13 @@ requests-toolbelt==1.0.0
# via zeep
rsa==4.9
# via google-auth
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
sailthru-client==2.3.5
# via -r requirements/base.in
simple-salesforce==1.12.5
# via -r requirements/base.in
simplejson==3.19.1
simplejson==3.19.2
# via sailthru-client
six==1.16.0
# via
Expand Down Expand Up @@ -234,19 +235,20 @@ typing-extensions==4.8.0
# via
# asgiref
# edx-opaque-keys
# pygithub
unicodecsv==0.14.1
# via -r requirements/base.in
uritemplate==3.0.1
# via google-api-python-client
urllib3==1.26.16
urllib3==1.26.18
# via
# botocore
# google-auth
# kubernetes
# pygithub
# requests
validators==0.22.0
# via -r requirements/base.in
websocket-client==1.6.3
websocket-client==1.6.4
# via kubernetes
wrapt==1.15.0
# via
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==59.8.0
# via
Expand Down
45 changes: 21 additions & 24 deletions requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
#
# make upgrade
#
astroid==2.15.7
astroid==3.0.1
# via
# -r requirements/testing.in
# pylint
# pylint-celery
boto3==1.28.53
boto3==1.28.68
# via moto
botocore==1.31.53
botocore==1.31.68
# via
# boto3
# moto
# s3transfer
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via cryptography
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
click==8.1.7
# via
Expand All @@ -31,8 +31,10 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
coverage[toml]==7.3.1
# via pytest-cov
coverage[toml]==7.3.2
# via
# coverage
# pytest-cov
cryptography==41.0.4
# via moto
ddt==1.6.0
Expand Down Expand Up @@ -61,8 +63,6 @@ jmespath==1.0.1
# via
# boto3
# botocore
lazy-object-proxy==1.9.0
# via astroid
markupsafe==2.1.3
# via
# jinja2
Expand All @@ -71,25 +71,25 @@ mccabe==0.7.0
# via pylint
mock==5.1.0
# via -r requirements/testing.in
moto==4.2.4
moto==4.2.6
# via -r requirements/testing.in
packaging==23.1
packaging==23.2
# via pytest
pbr==5.11.1
# via stevedore
platformdirs==3.10.0
platformdirs==3.11.0
# via pylint
pluggy==1.3.0
# via pytest
py==1.11.0
# via pytest-pycodestyle
pycodestyle==2.11.0
pycodestyle==2.11.1
# via
# -r requirements/testing.in
# pytest-pycodestyle
pycparser==2.21
# via cffi
pylint==2.17.6
pylint==3.0.2
# via
# -r requirements/testing.in
# edx-lint
Expand All @@ -99,7 +99,7 @@ pylint==2.17.6
# pytest-pylint
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 All @@ -116,7 +116,7 @@ pytest-cov==4.1.0
# via -r requirements/testing.in
pytest-pycodestyle==2.3.1
# via -r requirements/testing.in
pytest-pylint==0.19.0
pytest-pylint==0.21.0
# via -r requirements/testing.in
pytest-xdist==3.3.1
# via -r requirements/testing.in
Expand All @@ -140,7 +140,7 @@ responses==0.20.0
# -c requirements/constraints.txt
# -r requirements/testing.in
# moto
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
six==1.16.0
# via
Expand All @@ -151,29 +151,26 @@ stevedore==5.1.0
# via code-annotations
text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via pytest-pylint
tomli==2.0.1
# via
# coverage
# pylint
# pytest
# pytest-pylint
tomlkit==0.12.1
# via pylint
typing-extensions==4.8.0
# via
# astroid
# pylint
urllib3==1.26.16
urllib3==1.26.18
# via
# botocore
# requests
# responses
werkzeug==2.3.7
werkzeug==3.0.0
# via moto
wrapt==1.15.0
# via
# -r requirements/testing.in
# astroid
# via -r requirements/testing.in
xmltodict==0.13.0
# via moto
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ skip_missing_interpreters = True
deps =
pytest
-r{toxinidir}/requirements/testing.txt
whitelist_externals=pytest
allowlist_externals=pytest
commands=pytest {posargs:-n auto}
setenv =
AWS_DEFAULT_REGION=us-east-1
Expand Down

0 comments on commit 2d2811e

Please sign in to comment.