From e7c2991964b99ebb8c64c16b0320c00521c3d612 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 Oct 2023 09:09:27 -0400 Subject: [PATCH 1/3] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- requirements/base.txt | 10 ++++---- requirements/ci.in | 1 - requirements/ci.txt | 11 +++----- requirements/dev.txt | 52 +++++++++++++++----------------------- requirements/doc.txt | 29 +++++++++++---------- requirements/pip-tools.txt | 4 +-- requirements/pip.txt | 4 +-- requirements/quality.txt | 29 ++++++++++----------- requirements/test.txt | 16 +++++++----- tox.ini | 6 ++--- 10 files changed, 73 insertions(+), 89 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 1ac9316f..e1bbff6a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,11 +6,11 @@ # asgiref==3.7.2 # via django -cffi==1.15.1 +cffi==1.16.0 # via pynacl click==8.1.7 # via -r requirements/base.in -django==3.2.21 +django==3.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -20,11 +20,11 @@ django-crum==0.7.9 # via -r requirements/base.in django-waffle==4.0.0 # via -r requirements/base.in -newrelic==9.0.0 +newrelic==9.1.1 # via -r requirements/base.in pbr==5.11.1 # via stevedore -psutil==5.9.5 +psutil==5.9.6 # via -r requirements/base.in pycparser==2.21 # via cffi @@ -36,5 +36,5 @@ sqlparse==0.4.4 # via django stevedore==5.1.0 # via -r requirements/base.in -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via asgiref diff --git a/requirements/ci.in b/requirements/ci.in index 532ae973..afdeaa33 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -3,4 +3,3 @@ -c constraints.txt tox # Virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes diff --git a/requirements/ci.txt b/requirements/ci.txt index 3365f1c1..267f554b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,13 +6,13 @@ # distlib==0.3.7 # via virtualenv -filelock==3.12.3 +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 @@ -26,10 +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 -typing-extensions==4.7.1 - # via filelock virtualenv==20.24.5 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index addc8caa..60d0b388 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,13 +4,13 @@ # # make upgrade # -annotated-types==0.5.0 +annotated-types==0.6.0 # via pydantic asgiref==3.7.2 # via # -r requirements/quality.txt # django -astroid==2.15.6 +astroid==3.0.1 # via # -r requirements/quality.txt # pylint @@ -19,7 +19,7 @@ build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/quality.txt # pynacl @@ -41,9 +41,10 @@ code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/quality.txt + # coverage # pytest-cov ddt==1.6.0 # via -r requirements/quality.txt @@ -59,7 +60,7 @@ distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv -django==3.2.21 +django==3.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt @@ -70,7 +71,7 @@ django-crum==0.7.9 # via -r requirements/quality.txt django-waffle==4.0.0 # via -r requirements/quality.txt -edx-i18n-tools==1.1.0 +edx-i18n-tools==1.3.0 # via -r requirements/dev.in edx-lint==5.3.4 # via -r requirements/quality.txt @@ -78,7 +79,7 @@ exceptiongroup==1.1.3 # via # -r requirements/quality.txt # pytest -filelock==3.12.3 +filelock==3.12.4 # via # -r requirements/ci.txt # tox @@ -105,10 +106,8 @@ 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 +lxml==4.9.3 + # via edx-i18n-tools markupsafe==2.1.3 # via # -r requirements/quality.txt @@ -119,9 +118,9 @@ mccabe==0.7.0 # pylint mock==5.1.0 # via -r requirements/quality.txt -newrelic==9.0.0 +newrelic==9.1.1 # via -r requirements/quality.txt -packaging==23.1 +packaging==23.2 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -137,7 +136,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 # -r requirements/quality.txt @@ -152,27 +151,27 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==5.9.5 +psutil==5.9.6 # via -r requirements/quality.txt 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 # -r requirements/quality.txt # cffi -pydantic==2.3.0 +pydantic==2.4.2 # via inflect -pydantic-core==2.6.3 +pydantic-core==2.10.1 # via pydantic pydocstyle==6.3.0 # via -r requirements/quality.txt pygments==2.16.1 # via diff-cover -pylint==2.17.5 +pylint==3.0.2 # via # -r requirements/quality.txt # edx-lint @@ -183,7 +182,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 @@ -265,17 +264,12 @@ 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.7.1 +typing-extensions==4.8.0 # via - # -r requirements/ci.txt # -r requirements/quality.txt # annotated-types # asgiref # astroid - # filelock # inflect # pydantic # pydantic-core @@ -288,11 +282,7 @@ wheel==0.41.2 # via # -r requirements/pip-tools.txt # pip-tools -wrapt==1.15.0 - # via - # -r requirements/quality.txt - # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index 3bd58e19..e94dda24 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -babel==2.12.1 +babel==2.13.0 # via # pydata-sphinx-theme # sphinx @@ -20,24 +20,25 @@ beautifulsoup4==4.12.2 # via pydata-sphinx-theme certifi==2023.7.22 # via requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.1 # via requests click==8.1.7 # via -r requirements/test.txt -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via secretstorage ddt==1.6.0 # via -r requirements/test.txt -django==3.2.21 +django==3.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -70,7 +71,7 @@ importlib-metadata==6.8.0 # via # keyring # twine -importlib-resources==6.0.1 +importlib-resources==6.1.0 # via keyring iniconfig==2.0.0 # via @@ -96,11 +97,11 @@ mock==5.1.0 # via -r requirements/test.txt more-itertools==10.1.0 # via jaraco-classes -newrelic==9.0.0 +newrelic==9.1.1 # via -r requirements/test.txt nh3==0.2.14 # via readme-renderer -packaging==23.1 +packaging==23.2 # via # -r requirements/test.txt # pydata-sphinx-theme @@ -116,7 +117,7 @@ pluggy==1.3.0 # via # -r requirements/test.txt # pytest -psutil==5.9.5 +psutil==5.9.6 # via -r requirements/test.txt pycparser==2.21 # via @@ -163,7 +164,7 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.5.2 +rich==13.6.0 # via twine secretstorage==3.3.3 # via keyring @@ -206,17 +207,17 @@ tomli==2.0.1 # pytest twine==4.0.2 # via -r requirements/doc.in -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref # pydata-sphinx-theme # rich -urllib3==2.0.4 +urllib3==2.0.7 # via # requests # twine -zipp==3.16.2 +zipp==3.17.0 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index d2e8e4e5..50d35f22 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -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 @@ -23,7 +23,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools -zipp==3.16.2 +zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index da0741c5..0c788d61 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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.0 +setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index ee817923..09d40986 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,11 +8,11 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.6 +astroid==3.0.1 # via # pylint # pylint-celery -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/test.txt # pynacl @@ -26,15 +26,16 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/test.txt + # coverage # pytest-cov ddt==1.6.0 # via -r requirements/test.txt dill==0.3.7 # via pylint -django==3.2.21 +django==3.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -60,17 +61,15 @@ 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 # via pylint mock==5.1.0 # via -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.1 # via -r requirements/test.txt -packaging==23.1 +packaging==23.2 # via # -r requirements/test.txt # pytest @@ -78,15 +77,15 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via pylint pluggy==1.3.0 # via # -r requirements/test.txt # pytest -psutil==5.9.5 +psutil==5.9.6 # via -r requirements/test.txt -pycodestyle==2.11.0 +pycodestyle==2.11.1 # via -r requirements/quality.in pycparser==2.21 # via @@ -94,7 +93,7 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==2.17.5 +pylint==3.0.2 # via # edx-lint # pylint-celery @@ -102,7 +101,7 @@ pylint==2.17.5 # 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 @@ -149,11 +148,9 @@ tomli==2.0.1 # pytest tomlkit==0.12.1 # via pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref # astroid # pylint -wrapt==1.15.0 - # via astroid diff --git a/requirements/test.txt b/requirements/test.txt index eecb1f1f..6229376a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,14 +8,16 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # pynacl click==8.1.7 # via -r requirements/base.txt -coverage[toml]==7.3.1 - # via pytest-cov +coverage[toml]==7.3.2 + # via + # coverage + # pytest-cov ddt==1.6.0 # via -r requirements/test.in # via @@ -33,9 +35,9 @@ iniconfig==2.0.0 # via pytest mock==5.1.0 # via -r requirements/test.in -newrelic==9.0.0 +newrelic==9.1.1 # via -r requirements/base.txt -packaging==23.1 +packaging==23.2 # via pytest pbr==5.11.1 # via @@ -43,7 +45,7 @@ pbr==5.11.1 # stevedore pluggy==1.3.0 # via pytest -psutil==5.9.5 +psutil==5.9.6 # via -r requirements/base.txt pycparser==2.21 # via @@ -73,7 +75,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref diff --git a/tox.ini b/tox.ini index 7925aee8..328b95d7 100644 --- a/tox.ini +++ b/tox.ini @@ -47,7 +47,7 @@ commands = setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = {toxinidir} -whitelist_externals = +allowlist_externals = make rm deps = @@ -65,7 +65,7 @@ commands = setenv = DJANGO_SETTINGS_MODULE = test_settings PYTHONPATH = {toxinidir} -whitelist_externals = +allowlist_externals = make rm touch @@ -81,7 +81,7 @@ commands = make selfcheck [testenv:isort] -whitelist_externals = +allowlist_externals = make deps = -r{toxinidir}/requirements/quality.txt From 18796bae92957658035845db1eeeb9d24face7b4 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 17:44:27 +0500 Subject: [PATCH 2/3] fix: requirements upgraded only for tox-battery --- requirements/base.txt | 10 ++++---- requirements/ci.txt | 8 ++++--- requirements/dev.txt | 49 ++++++++++++++++++++++---------------- requirements/doc.txt | 36 ++++++++++------------------ requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 4 ++-- requirements/quality.txt | 29 ++++++++++++---------- requirements/test.txt | 16 ++++++------- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e1bbff6a..1ac9316f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,11 +6,11 @@ # asgiref==3.7.2 # via django -cffi==1.16.0 +cffi==1.15.1 # via pynacl click==8.1.7 # via -r requirements/base.in -django==3.2.22 +django==3.2.21 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in @@ -20,11 +20,11 @@ django-crum==0.7.9 # via -r requirements/base.in django-waffle==4.0.0 # via -r requirements/base.in -newrelic==9.1.1 +newrelic==9.0.0 # via -r requirements/base.in pbr==5.11.1 # via stevedore -psutil==5.9.6 +psutil==5.9.5 # via -r requirements/base.in pycparser==2.21 # via cffi @@ -36,5 +36,5 @@ sqlparse==0.4.4 # via django stevedore==5.1.0 # via -r requirements/base.in -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via asgiref diff --git a/requirements/ci.txt b/requirements/ci.txt index 267f554b..73653463 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -6,13 +6,13 @@ # distlib==0.3.7 # via virtualenv -filelock==3.12.4 +filelock==3.12.3 # via # tox # virtualenv -packaging==23.2 +packaging==23.1 # via tox -platformdirs==3.11.0 +platformdirs==3.10.0 # via virtualenv pluggy==1.3.0 # via tox @@ -26,5 +26,7 @@ tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.in +typing-extensions==4.7.1 + # via filelock virtualenv==20.24.5 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 60d0b388..4d9749d3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,13 +4,13 @@ # # make upgrade # -annotated-types==0.6.0 +annotated-types==0.5.0 # via pydantic asgiref==3.7.2 # via # -r requirements/quality.txt # django -astroid==3.0.1 +astroid==2.15.6 # via # -r requirements/quality.txt # pylint @@ -19,7 +19,7 @@ build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/quality.txt # pynacl @@ -41,10 +41,9 @@ code-annotations==1.5.0 # via # -r requirements/quality.txt # edx-lint -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/quality.txt - # coverage # pytest-cov ddt==1.6.0 # via -r requirements/quality.txt @@ -60,7 +59,7 @@ distlib==0.3.7 # via # -r requirements/ci.txt # virtualenv -django==3.2.22 +django==3.2.21 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt @@ -71,7 +70,7 @@ django-crum==0.7.9 # via -r requirements/quality.txt django-waffle==4.0.0 # via -r requirements/quality.txt -edx-i18n-tools==1.3.0 +edx-i18n-tools==1.1.0 # via -r requirements/dev.in edx-lint==5.3.4 # via -r requirements/quality.txt @@ -79,7 +78,7 @@ exceptiongroup==1.1.3 # via # -r requirements/quality.txt # pytest -filelock==3.12.4 +filelock==3.12.3 # via # -r requirements/ci.txt # tox @@ -106,8 +105,10 @@ jinja2==3.1.2 # jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover -lxml==4.9.3 - # via edx-i18n-tools +lazy-object-proxy==1.9.0 + # via + # -r requirements/quality.txt + # astroid markupsafe==2.1.3 # via # -r requirements/quality.txt @@ -118,9 +119,9 @@ mccabe==0.7.0 # pylint mock==5.1.0 # via -r requirements/quality.txt -newrelic==9.1.1 +newrelic==9.0.0 # via -r requirements/quality.txt -packaging==23.2 +packaging==23.1 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -136,7 +137,7 @@ pbr==5.11.1 # stevedore pip-tools==7.3.0 # via -r requirements/pip-tools.txt -platformdirs==3.11.0 +platformdirs==3.10.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -151,27 +152,27 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -psutil==5.9.6 +psutil==5.9.5 # via -r requirements/quality.txt py==1.11.0 # via # -r requirements/ci.txt # tox -pycodestyle==2.11.1 +pycodestyle==2.11.0 # via -r requirements/quality.txt pycparser==2.21 # via # -r requirements/quality.txt # cffi -pydantic==2.4.2 +pydantic==2.3.0 # via inflect -pydantic-core==2.10.1 +pydantic-core==2.6.3 # via pydantic pydocstyle==6.3.0 # via -r requirements/quality.txt pygments==2.16.1 # via diff-cover -pylint==3.0.2 +pylint==2.17.5 # via # -r requirements/quality.txt # edx-lint @@ -182,7 +183,7 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.5.4 +pylint-django==2.5.3 # via # -r requirements/quality.txt # edx-lint @@ -264,12 +265,14 @@ tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.txt -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via + # -r requirements/ci.txt # -r requirements/quality.txt # annotated-types # asgiref # astroid + # filelock # inflect # pydantic # pydantic-core @@ -282,7 +285,11 @@ wheel==0.41.2 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +wrapt==1.15.0 + # via + # -r requirements/quality.txt + # astroid +zipp==3.16.2 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/doc.txt b/requirements/doc.txt index e94dda24..ae35785d 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,7 +12,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -babel==2.13.0 +babel==2.12.1 # via # pydata-sphinx-theme # sphinx @@ -20,25 +20,21 @@ beautifulsoup4==4.12.2 # via pydata-sphinx-theme certifi==2023.7.22 # via requests -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/test.txt - # cryptography # pynacl -charset-normalizer==3.3.1 +charset-normalizer==3.2.0 # via requests click==8.1.7 # via -r requirements/test.txt -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/test.txt - # coverage # pytest-cov -cryptography==41.0.4 - # via secretstorage ddt==1.6.0 # via -r requirements/test.txt -django==3.2.22 +django==3.2.21 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -71,7 +67,7 @@ importlib-metadata==6.8.0 # via # keyring # twine -importlib-resources==6.1.0 +importlib-resources==6.0.1 # via keyring iniconfig==2.0.0 # via @@ -79,10 +75,6 @@ iniconfig==2.0.0 # pytest jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via sphinx keyring==24.2.0 @@ -97,11 +89,11 @@ mock==5.1.0 # via -r requirements/test.txt more-itertools==10.1.0 # via jaraco-classes -newrelic==9.1.1 +newrelic==9.0.0 # via -r requirements/test.txt nh3==0.2.14 # via readme-renderer -packaging==23.2 +packaging==23.1 # via # -r requirements/test.txt # pydata-sphinx-theme @@ -117,7 +109,7 @@ pluggy==1.3.0 # via # -r requirements/test.txt # pytest -psutil==5.9.6 +psutil==5.9.5 # via -r requirements/test.txt pycparser==2.21 # via @@ -164,10 +156,8 @@ restructuredtext-lint==1.4.0 # via doc8 rfc3986==2.0.0 # via twine -rich==13.6.0 +rich==13.5.2 # via twine -secretstorage==3.3.3 - # via keyring snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 @@ -207,17 +197,17 @@ tomli==2.0.1 # pytest twine==4.0.2 # via -r requirements/doc.in -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/test.txt # asgiref # pydata-sphinx-theme # rich -urllib3==2.0.7 +urllib3==2.0.4 # via # requests # twine -zipp==3.17.0 +zipp==3.16.2 # via # importlib-metadata # importlib-resources diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 50d35f22..d2e8e4e5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via pip-tools importlib-metadata==6.8.0 # via build -packaging==23.2 +packaging==23.1 # via build pip-tools==7.3.0 # via -r requirements/pip-tools.in @@ -23,7 +23,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools -zipp==3.17.0 +zipp==3.16.2 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 0c788d61..da0741c5 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -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.3.1 +pip==23.2.1 # via -r requirements/pip.in -setuptools==68.2.2 +setuptools==68.2.0 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 09d40986..ee817923 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,11 +8,11 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==3.0.1 +astroid==2.15.6 # via # pylint # pylint-celery -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/test.txt # pynacl @@ -26,16 +26,15 @@ click-log==0.4.0 # via edx-lint code-annotations==1.5.0 # via edx-lint -coverage[toml]==7.3.2 +coverage[toml]==7.3.1 # via # -r requirements/test.txt - # coverage # pytest-cov ddt==1.6.0 # via -r requirements/test.txt dill==0.3.7 # via pylint -django==3.2.22 +django==3.2.21 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -61,15 +60,17 @@ 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 # via pylint mock==5.1.0 # via -r requirements/test.txt -newrelic==9.1.1 +newrelic==9.0.0 # via -r requirements/test.txt -packaging==23.2 +packaging==23.1 # via # -r requirements/test.txt # pytest @@ -77,15 +78,15 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.11.0 +platformdirs==3.10.0 # via pylint pluggy==1.3.0 # via # -r requirements/test.txt # pytest -psutil==5.9.6 +psutil==5.9.5 # via -r requirements/test.txt -pycodestyle==2.11.1 +pycodestyle==2.11.0 # via -r requirements/quality.in pycparser==2.21 # via @@ -93,7 +94,7 @@ pycparser==2.21 # cffi pydocstyle==6.3.0 # via -r requirements/quality.in -pylint==3.0.2 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -101,7 +102,7 @@ pylint==3.0.2 # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.5.4 +pylint-django==2.5.3 # via edx-lint pylint-plugin-utils==0.8.2 # via @@ -148,9 +149,11 @@ tomli==2.0.1 # pytest tomlkit==0.12.1 # via pylint -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/test.txt # asgiref # astroid # pylint +wrapt==1.15.0 + # via astroid diff --git a/requirements/test.txt b/requirements/test.txt index 6229376a..eecb1f1f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,16 +8,14 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -cffi==1.16.0 +cffi==1.15.1 # via # -r requirements/base.txt # pynacl click==8.1.7 # via -r requirements/base.txt -coverage[toml]==7.3.2 - # via - # coverage - # pytest-cov +coverage[toml]==7.3.1 + # via pytest-cov ddt==1.6.0 # via -r requirements/test.in # via @@ -35,9 +33,9 @@ iniconfig==2.0.0 # via pytest mock==5.1.0 # via -r requirements/test.in -newrelic==9.1.1 +newrelic==9.0.0 # via -r requirements/base.txt -packaging==23.2 +packaging==23.1 # via pytest pbr==5.11.1 # via @@ -45,7 +43,7 @@ pbr==5.11.1 # stevedore pluggy==1.3.0 # via pytest -psutil==5.9.6 +psutil==5.9.5 # via -r requirements/base.txt pycparser==2.21 # via @@ -75,7 +73,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.8.0 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref From a0a41a094342762ce48d522b4bc4ef61e0036c44 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Tue, 31 Oct 2023 17:51:33 +0500 Subject: [PATCH 3/3] fix: tox-battery changes removed manually. --- requirements/doc.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/requirements/doc.txt b/requirements/doc.txt index ae35785d..3bd58e19 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -23,6 +23,7 @@ certifi==2023.7.22 cffi==1.15.1 # via # -r requirements/test.txt + # cryptography # pynacl charset-normalizer==3.2.0 # via requests @@ -32,6 +33,8 @@ coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov +cryptography==41.0.3 + # via secretstorage ddt==1.6.0 # via -r requirements/test.txt django==3.2.21 @@ -75,6 +78,10 @@ iniconfig==2.0.0 # pytest jaraco-classes==3.3.0 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage jinja2==3.1.2 # via sphinx keyring==24.2.0 @@ -158,6 +165,8 @@ rfc3986==2.0.0 # via twine rich==13.5.2 # via twine +secretstorage==3.3.3 + # via keyring snowballstemmer==2.2.0 # via sphinx soupsieve==2.5