From e2d44b5c9989b70f7c6910a3e20151ca188deea7 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 24 Oct 2023 20:34:39 +0500 Subject: [PATCH] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- requirements/base.txt | 60 +++++++++++++++++++------ requirements/ci.txt | 12 ++--- requirements/pip.txt | 6 +-- requirements/pip_tools.txt | 19 +++++--- requirements/quality.txt | 91 +++++++++++++++++++++++++++----------- requirements/test.txt | 8 ++-- requirements/tox.txt | 12 ++--- tox.ini | 14 +++--- 8 files changed, 152 insertions(+), 70 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 42f8256..191d319 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,50 +8,82 @@ # via -r requirements/base.in appdirs==1.4.4 # via fs -asgiref==3.6.0 +asgiref==3.7.2 # via django -django==3.2.18 +boto3==1.28.69 + # via fs-s3fs +botocore==1.31.69 + # via + # boto3 + # s3transfer +django==3.2.22 # via # -c requirements/common_constraints.txt # -r requirements/base.in + # openedx-django-pyfs fs==2.4.16 + # via + # fs-s3fs + # openedx-django-pyfs + # xblock +fs-s3fs==1.1.1 + # via openedx-django-pyfs +jmespath==1.0.1 + # via + # boto3 + # botocore +lazy==1.6 # via xblock -lxml==4.9.2 +lxml==4.9.3 # via xblock mako==1.2.4 - # via xblock-utils -markupsafe==2.1.2 + # via + # xblock + # xblock-utils +markupsafe==2.1.3 # via # mako # xblock -python-dateutil==2.8.2 +openedx-django-pyfs==3.4.0 # via xblock -pytz==2023.3 +python-dateutil==2.8.2 + # via + # botocore + # xblock +pytz==2023.3.post1 # via # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via xblock -simplejson==3.19.1 - # via xblock-utils +s3transfer==0.7.0 + # via boto3 +simplejson==3.19.2 + # via + # xblock + # xblock-utils six==1.16.0 # via - # codejail # fs + # fs-s3fs # python-dateutil sqlparse==0.4.4 # via django -web-fragments==2.0.0 +typing-extensions==4.8.0 + # via asgiref +urllib3==1.26.18 + # via botocore +web-fragments==2.1.0 # via # xblock # xblock-utils webob==1.8.7 # via xblock -xblock==1.6.2 +xblock[django]==1.8.1 # via # -r requirements/base.in # xblock-utils -xblock-utils==3.0.0 +xblock-utils==4.0.0 # via -r requirements/base.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/ci.txt b/requirements/ci.txt index 395c162..b0d542e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,24 +4,24 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via # -r requirements/tox.txt # virtualenv -filelock==3.12.0 +filelock==3.12.4 # via # -r requirements/tox.txt # tox # virtualenv -packaging==23.1 +packaging==23.2 # via # -r requirements/tox.txt # tox -platformdirs==3.5.0 +platformdirs==3.11.0 # via # -r requirements/tox.txt # virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via # -r requirements/tox.txt # tox @@ -41,7 +41,7 @@ tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/tox.txt -virtualenv==20.23.0 +virtualenv==20.24.6 # via # -r requirements/tox.txt # tox diff --git a/requirements/pip.txt b/requirements/pip.txt index e6827ba..0c788d6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.2 +pip==23.3.1 # via -r requirements/pip.in -setuptools==67.7.2 +setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index b615006..fed3370 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -4,20 +4,27 @@ # # make upgrade # -build==0.10.0 +build==1.0.3 # via pip-tools -click==8.1.3 +click==8.1.7 # via pip-tools -packaging==23.1 +importlib-metadata==6.8.0 # via build -pip-tools==6.13.0 +packaging==23.2 + # via build +pip-tools==7.3.0 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build -wheel==0.40.0 + # via + # build + # pip-tools + # pyproject-hooks +wheel==0.41.2 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/quality.txt b/requirements/quality.txt index 7ada2e2..019b596 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -10,54 +10,82 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django -astroid==2.15.4 +astroid==3.0.1 # via pylint -coverage==7.2.5 +boto3==1.28.69 + # via + # -r requirements/base.txt + # fs-s3fs +botocore==1.31.69 + # via + # -r requirements/base.txt + # boto3 + # s3transfer +coverage==7.3.2 # via -r requirements/test.txt -dill==0.3.6 +dill==0.3.7 # via pylint -django==3.2.18 +django==3.2.22 # via # -c requirements/common_constraints.txt # -r requirements/base.txt -edx-opaque-keys==2.3.0 + # openedx-django-pyfs +edx-opaque-keys==2.5.1 # via -r requirements/test.txt fs==2.4.16 # via # -r requirements/base.txt + # fs-s3fs + # openedx-django-pyfs # xblock +fs-s3fs==1.1.1 + # via + # -r requirements/base.txt + # openedx-django-pyfs isort==5.12.0 # via pylint -lazy-object-proxy==1.9.0 - # via astroid -lxml==4.9.2 +jmespath==1.0.1 + # via + # -r requirements/base.txt + # boto3 + # botocore +lazy==1.6 + # via + # -r requirements/base.txt + # xblock +lxml==4.9.3 # via # -r requirements/base.txt # xblock mako==1.2.4 # via # -r requirements/base.txt + # xblock # xblock-utils -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # mako # xblock mccabe==0.7.0 # via pylint +openedx-django-pyfs==3.4.0 + # via + # -r requirements/base.txt + # xblock pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.5.0 +platformdirs==3.11.0 # via pylint -pycodestyle==2.10.0 +pycodestyle==2.11.1 # via -r requirements/quality.in -pylint==2.17.3 +pylint==3.0.2 # via -r requirements/quality.in pymongo==3.13.0 # via @@ -66,43 +94,57 @@ pymongo==3.13.0 python-dateutil==2.8.2 # via # -r requirements/base.txt + # botocore # xblock -pytz==2023.3 +pytz==2023.3.post1 # via # -r requirements/base.txt # django # xblock -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # xblock -simplejson==3.19.1 +s3transfer==0.7.0 # via # -r requirements/base.txt + # boto3 +simplejson==3.19.2 + # via + # -r requirements/base.txt + # xblock # xblock-utils six==1.16.0 # via # -r requirements/base.txt - # codejail # fs + # fs-s3fs # python-dateutil sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/test.txt # edx-opaque-keys tomli==2.0.1 # via pylint -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint -typing-extensions==4.5.0 +typing-extensions==4.8.0 # via + # -r requirements/base.txt + # -r requirements/test.txt + # asgiref # astroid + # edx-opaque-keys # pylint -web-fragments==2.0.0 +urllib3==1.26.18 + # via + # -r requirements/base.txt + # botocore +web-fragments==2.1.0 # via # -r requirements/base.txt # xblock @@ -111,13 +153,12 @@ webob==1.8.7 # via # -r requirements/base.txt # xblock -wrapt==1.15.0 - # via astroid -xblock==1.6.2 +xblock[django]==1.8.1 # via # -r requirements/base.txt + # xblock # xblock-utils -xblock-utils==3.0.0 +xblock-utils==4.0.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index 4d5167e..5c45164 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,13 +4,15 @@ # # make upgrade # -coverage==7.2.5 +coverage==7.3.2 # via -r requirements/test.in -edx-opaque-keys==2.3.0 +edx-opaque-keys==2.5.1 # via -r requirements/test.in pbr==5.11.1 # via stevedore pymongo==3.13.0 # via edx-opaque-keys -stevedore==5.0.0 +stevedore==5.1.0 + # via edx-opaque-keys +typing-extensions==4.8.0 # via edx-opaque-keys diff --git a/requirements/tox.txt b/requirements/tox.txt index 5b54fec..d9a3fb1 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -4,17 +4,17 @@ # # make upgrade # -distlib==0.3.6 +distlib==0.3.7 # via virtualenv -filelock==3.12.0 +filelock==3.12.4 # via # tox # virtualenv -packaging==23.1 +packaging==23.2 # via tox -platformdirs==3.5.0 +platformdirs==3.11.0 # via virtualenv -pluggy==1.0.0 +pluggy==1.3.0 # via tox py==1.11.0 # via tox @@ -26,5 +26,5 @@ tox==3.28.0 # via # -c requirements/common_constraints.txt # -r requirements/tox.in -virtualenv==20.23.0 +virtualenv==20.24.6 # via tox diff --git a/tox.ini b/tox.ini index 10f7578..4a19447 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ commands = skip_install = True [testenv:csslint] -whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js +allowlist_externals = {toxinidir}/node_modules/csslint/dist/cli.js passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH commands = {toxinidir}/node_modules/csslint/dist/cli.js sql_grader/static/ @@ -29,7 +29,7 @@ deps = skip_install = True [testenv:eslint] -whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js +allowlist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH commands = {toxinidir}/node_modules/eslint/bin/eslint.js sql_grader/static/view.js @@ -56,7 +56,7 @@ deps = transifex-client commands = cd sql_grader && i18n_tool transifex pull -whitelist_externals = +allowlist_externals = cd [testenv:translations_compile] @@ -64,7 +64,7 @@ deps = edx-i18n-tools==0.4.8 commands = cd sql_grader && i18n_tool generate -whitelist_externals = +allowlist_externals = cd [testenv:translations_dummy] @@ -72,7 +72,7 @@ deps = edx-i18n-tools==0.4.8 commands = cd sql_grader && i18n_tool dummy -whitelist_externals = +allowlist_externals = cd [testenv:translations_detect_changed] @@ -80,7 +80,7 @@ deps = edx-i18n-tools==0.4.8 commands = cd sql_grader && i18n_tool changed -whitelist_externals = +allowlist_externals = cd [testenv:translations_extract] @@ -88,6 +88,6 @@ deps = edx-i18n-tools==0.4.8 commands = cd sql_grader && i18n_tool extract -whitelist_externals = +allowlist_externals = cd