From 2388c71aa0c782720f40491ad75a4bce6bf68dbf Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 28 Nov 2023 06:46:16 -0500 Subject: [PATCH 1/3] chore: Updating Python Requirements (#307) --- requirements/base.txt | 8 ++++---- requirements/ci.txt | 2 +- requirements/dev.txt | 24 ++++++++++++------------ requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- requirements/test.txt | 20 ++++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index d035faf..a41022b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ # asgiref==3.7.2 # via django -certifi==2023.7.22 +certifi==2023.11.17 # via requests cffi==1.16.0 # via pynacl @@ -24,11 +24,11 @@ django-crum==0.7.9 # via edx-django-utils django-waffle==4.0.0 # via edx-django-utils -edx-django-utils==5.8.0 +edx-django-utils==5.9.0 # via -r requirements/base.in -idna==3.4 +idna==3.6 # via requests -newrelic==9.1.2 +newrelic==9.2.0 # via edx-django-utils pbr==6.0.0 # via stevedore diff --git a/requirements/ci.txt b/requirements/ci.txt index 6a85a1b..6430bcd 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -35,5 +35,5 @@ tox==3.28.0 # tox-battery tox-battery==0.6.2 # via -r requirements/ci.in -virtualenv==20.24.6 +virtualenv==20.24.7 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index a20e62f..6012ffb 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -17,7 +17,7 @@ build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools -certifi==2023.7.22 +certifi==2023.11.17 # via # -r requirements/test.txt # requests @@ -52,7 +52,7 @@ coverage[toml]==7.3.2 # -r requirements/test.txt # coverage # pytest-cov -cryptography==41.0.5 +cryptography==41.0.7 # via # -r requirements/test.txt # secretstorage @@ -85,11 +85,11 @@ docutils==0.20.1 # via # -r requirements/test.txt # readme-renderer -edx-django-utils==5.8.0 +edx-django-utils==5.9.0 # via -r requirements/test.txt edx-lint==5.3.6 # via -r requirements/test.txt -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via # -r requirements/test.txt # pytest @@ -100,7 +100,7 @@ filelock==3.13.1 # virtualenv freezegun==1.2.2 # via -r requirements/test.txt -idna==3.4 +idna==3.6 # via # -r requirements/test.txt # requests @@ -160,7 +160,7 @@ more-itertools==10.1.0 # via # -r requirements/test.txt # jaraco-classes -newrelic==9.1.2 +newrelic==9.2.0 # via # -r requirements/test.txt # edx-django-utils @@ -213,7 +213,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pygments==2.16.1 +pygments==2.17.2 # via # -r requirements/test.txt # readme-renderer @@ -289,13 +289,13 @@ requests-toolbelt==1.0.0 # via # -r requirements/test.txt # twine -responses==0.24.0 +responses==0.24.1 # via -r requirements/test.txt rfc3986==2.0.0 # via # -r requirements/test.txt # twine -rich==13.6.0 +rich==13.7.0 # via # -r requirements/test.txt # twine @@ -337,7 +337,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.12.2 +tomlkit==0.12.3 # via # -r requirements/test.txt # pylint @@ -362,11 +362,11 @@ urllib3==2.1.0 # requests # responses # twine -virtualenv==20.24.6 +virtualenv==20.24.7 # via # -r requirements/ci.txt # tox -wheel==0.41.3 +wheel==0.42.0 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ea34731..41203fd 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -21,7 +21,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.3 +wheel==0.42.0 # via pip-tools zipp==3.17.0 # via importlib-metadata diff --git a/requirements/pip.txt b/requirements/pip.txt index 9014f2c..14cb99c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.41.3 +wheel==0.42.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==23.3.1 # via -r requirements/pip.in -setuptools==68.2.2 +setuptools==69.0.2 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 9a196cc..aeca6f5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -12,7 +12,7 @@ astroid==3.0.1 # via # pylint # pylint-celery -certifi==2023.7.22 +certifi==2023.11.17 # via # -r requirements/base.txt # requests @@ -40,7 +40,7 @@ coverage[toml]==7.3.2 # via # coverage # pytest-cov -cryptography==41.0.5 +cryptography==41.0.7 # via secretstorage ddt==1.7.0 # via -r requirements/test.in @@ -62,15 +62,15 @@ django-waffle==4.0.0 # edx-django-utils docutils==0.20.1 # via readme-renderer -edx-django-utils==5.8.0 +edx-django-utils==5.9.0 # via -r requirements/base.txt edx-lint==5.3.6 # via -r requirements/test.in -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via pytest freezegun==1.2.2 # via -r requirements/test.in -idna==3.4 +idna==3.6 # via # -r requirements/base.txt # requests @@ -104,7 +104,7 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==10.1.0 # via jaraco-classes -newrelic==9.1.2 +newrelic==9.2.0 # via # -r requirements/base.txt # edx-django-utils @@ -134,7 +134,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pygments==2.16.1 +pygments==2.17.2 # via # readme-renderer # rich @@ -189,11 +189,11 @@ requests==2.31.0 # twine requests-toolbelt==1.0.0 # via twine -responses==0.24.0 +responses==0.24.1 # via -r requirements/test.in rfc3986==2.0.0 # via twine -rich==13.6.0 +rich==13.7.0 # via twine secretstorage==3.3.3 # via keyring @@ -219,7 +219,7 @@ tomli==2.0.1 # coverage # pylint # pytest -tomlkit==0.12.2 +tomlkit==0.12.3 # via pylint twine==4.0.2 # via -r requirements/test.in From c7adf71a0afef54c45ff3d7462c8b75dbcedf3fd Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Mon, 11 Dec 2023 13:13:27 +0500 Subject: [PATCH 2/3] fix: remove tox-battery requirement (#309) * fix: remove tox-battery requirement * fix: fix quality failure --- requirements/base.txt | 2 +- requirements/ci.in | 1 - requirements/ci.txt | 21 +++++++------- requirements/dev.txt | 58 +++++++++++++++++--------------------- requirements/pip-tools.txt | 2 +- requirements/test.txt | 23 ++++----------- tox.ini | 3 +- 7 files changed, 46 insertions(+), 64 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index a41022b..e620069 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,7 +28,7 @@ edx-django-utils==5.9.0 # via -r requirements/base.in idna==3.6 # via requests -newrelic==9.2.0 +newrelic==9.3.0 # via edx-django-utils pbr==6.0.0 # via stevedore diff --git a/requirements/ci.in b/requirements/ci.in index 11fd753..cac9426 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -2,4 +2,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 6430bcd..efd0814 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,6 +4,12 @@ # # make upgrade # +cachetools==5.3.2 + # via tox +chardet==5.2.0 + # via tox +colorama==0.4.6 + # via tox distlib==0.3.7 # via virtualenv filelock==3.13.1 @@ -14,26 +20,19 @@ packaging==23.2 # via # pyproject-api # tox -platformdirs==3.11.0 +platformdirs==4.1.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # tox # virtualenv pluggy==1.3.0 # via tox -py==1.11.0 - # via tox -six==1.16.0 +pyproject-api==1.6.1 # via tox tomli==2.0.1 # via # pyproject-api # tox -tox==3.28.0 - # via - # -r requirements/ci.in - # tox-battery -tox-battery==0.6.2 +tox==4.11.4 # via -r requirements/ci.in -virtualenv==20.24.7 +virtualenv==20.25.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 6012ffb..3174253 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -17,6 +17,10 @@ build==1.0.3 # via # -r requirements/pip-tools.txt # pip-tools +cachetools==5.3.2 + # via + # -r requirements/ci.txt + # tox certifi==2023.11.17 # via # -r requirements/test.txt @@ -24,8 +28,11 @@ certifi==2023.11.17 cffi==1.16.0 # via # -r requirements/test.txt - # cryptography # pynacl +chardet==5.2.0 + # via + # -r requirements/ci.txt + # tox charset-normalizer==3.3.2 # via # -r requirements/test.txt @@ -47,15 +54,15 @@ code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint +colorama==0.4.6 + # via + # -r requirements/ci.txt + # tox coverage[toml]==7.3.2 # via # -r requirements/test.txt # coverage # pytest-cov -cryptography==41.0.7 - # via - # -r requirements/test.txt - # secretstorage ddt==1.7.0 # via -r requirements/test.txt dill==0.3.7 @@ -98,13 +105,13 @@ filelock==3.13.1 # -r requirements/ci.txt # tox # virtualenv -freezegun==1.2.2 +freezegun==1.3.1 # via -r requirements/test.txt idna==3.6 # via # -r requirements/test.txt # requests -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via # -r requirements/pip-tools.txt # -r requirements/test.txt @@ -127,11 +134,6 @@ jaraco-classes==3.3.0 # via # -r requirements/test.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/test.txt - # keyring - # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -160,11 +162,11 @@ more-itertools==10.1.0 # via # -r requirements/test.txt # jaraco-classes -newrelic==9.2.0 +newrelic==9.3.0 # via # -r requirements/test.txt # edx-django-utils -nh3==0.2.14 +nh3==0.2.15 # via # -r requirements/test.txt # readme-renderer @@ -174,6 +176,7 @@ packaging==23.2 # -r requirements/pip-tools.txt # -r requirements/test.txt # build + # pyproject-api # pytest # tox pbr==6.0.0 @@ -186,12 +189,12 @@ pkginfo==1.9.6 # via # -r requirements/test.txt # twine -platformdirs==3.11.0 +platformdirs==4.1.0 # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.txt # -r requirements/test.txt # pylint + # tox # virtualenv pluggy==1.3.0 # via @@ -203,10 +206,6 @@ 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.1 # via -r requirements/test.txt pycparser==2.21 @@ -244,6 +243,10 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils +pyproject-api==1.6.1 + # via + # -r requirements/ci.txt + # tox pyproject-hooks==1.0.0 # via # -r requirements/pip-tools.txt @@ -299,17 +302,11 @@ rich==13.7.0 # via # -r requirements/test.txt # twine -secretstorage==3.3.3 - # via - # -r requirements/test.txt - # keyring six==1.16.0 # via - # -r requirements/ci.txt # -r requirements/test.txt # edx-lint # python-dateutil - # tox slumber==0.7.1 # via -r requirements/test.txt sqlparse==0.4.4 @@ -334,6 +331,7 @@ tomli==2.0.1 # coverage # pip-tools # pylint + # pyproject-api # pyproject-hooks # pytest # tox @@ -341,11 +339,7 @@ tomlkit==0.12.3 # via # -r requirements/test.txt # pylint -tox==3.28.0 - # via - # -r requirements/ci.txt - # tox-battery -tox-battery==0.6.2 +tox==4.11.4 # via -r requirements/ci.txt twine==4.0.2 # via -r requirements/test.txt @@ -362,7 +356,7 @@ urllib3==2.1.0 # requests # responses # twine -virtualenv==20.24.7 +virtualenv==20.25.0 # via # -r requirements/ci.txt # tox diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 41203fd..93a9cee 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via build packaging==23.2 # via build diff --git a/requirements/test.txt b/requirements/test.txt index aeca6f5..15fddaf 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -19,7 +19,6 @@ certifi==2023.11.17 cffi==1.16.0 # via # -r requirements/base.txt - # cryptography # pynacl charset-normalizer==3.3.2 # via @@ -40,8 +39,6 @@ coverage[toml]==7.3.2 # via # coverage # pytest-cov -cryptography==41.0.7 - # via secretstorage ddt==1.7.0 # via -r requirements/test.in dill==0.3.7 @@ -68,13 +65,13 @@ edx-lint==5.3.6 # via -r requirements/test.in exceptiongroup==1.2.0 # via pytest -freezegun==1.2.2 +freezegun==1.3.1 # via -r requirements/test.in idna==3.6 # via # -r requirements/base.txt # requests -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via # keyring # twine @@ -86,10 +83,6 @@ isort==5.12.0 # via pylint jaraco-classes==3.3.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.2 # via code-annotations keyring==24.3.0 @@ -104,11 +97,11 @@ mdurl==0.1.2 # via markdown-it-py more-itertools==10.1.0 # via jaraco-classes -newrelic==9.2.0 +newrelic==9.3.0 # via # -r requirements/base.txt # edx-django-utils -nh3==0.2.14 +nh3==0.2.15 # via readme-renderer packaging==23.2 # via pytest @@ -118,10 +111,8 @@ pbr==6.0.0 # stevedore pkginfo==1.9.6 # via twine -platformdirs==3.11.0 - # via - # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - # pylint +platformdirs==4.1.0 + # via pylint pluggy==1.3.0 # via pytest psutil==5.9.6 @@ -195,8 +186,6 @@ rfc3986==2.0.0 # via twine rich==13.7.0 # via twine -secretstorage==3.3.3 - # via keyring six==1.16.0 # via # edx-lint diff --git a/tox.ini b/tox.ini index e2a7b76..14f3bea 100644 --- a/tox.ini +++ b/tox.ini @@ -21,5 +21,6 @@ setenv = commands = pycodestyle --config=.pep8 edx_rest_api_client pylint --rcfile=pylintrc edx_rest_api_client - twine check {distdir}/* + python setup.py bdist_wheel + twine check dist/* From 3d4cb52b00d4aab7f7f1d4d4905cd77e11ee4b8a Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 12 Dec 2023 03:09:43 -0500 Subject: [PATCH 3/3] chore: Updating Python Requirements (#311) --- requirements/base.txt | 4 ++-- requirements/dev.txt | 22 ++++++++++++++++++---- requirements/test.txt | 17 +++++++++++++---- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e620069..824411f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,7 +22,7 @@ django==3.2.23 # edx-django-utils django-crum==0.7.9 # via edx-django-utils -django-waffle==4.0.0 +django-waffle==4.1.0 # via edx-django-utils edx-django-utils==5.9.0 # via -r requirements/base.in @@ -52,7 +52,7 @@ sqlparse==0.4.4 # via django stevedore==5.1.0 # via edx-django-utils -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via asgiref urllib3==2.1.0 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index 3174253..64c7a0a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -28,6 +28,7 @@ certifi==2023.11.17 cffi==1.16.0 # via # -r requirements/test.txt + # cryptography # pynacl chardet==5.2.0 # via @@ -63,6 +64,10 @@ coverage[toml]==7.3.2 # -r requirements/test.txt # coverage # pytest-cov +cryptography==41.0.7 + # via + # -r requirements/test.txt + # secretstorage ddt==1.7.0 # via -r requirements/test.txt dill==0.3.7 @@ -84,7 +89,7 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -126,7 +131,7 @@ iniconfig==2.0.0 # via # -r requirements/test.txt # pytest -isort==5.12.0 +isort==5.13.1 # via # -r requirements/test.txt # pylint @@ -134,6 +139,11 @@ jaraco-classes==3.3.0 # via # -r requirements/test.txt # keyring +jeepney==0.8.0 + # via + # -r requirements/test.txt + # keyring + # secretstorage jinja2==3.1.2 # via # -r requirements/test.txt @@ -219,7 +229,7 @@ pygments==2.17.2 # rich pyjwt==2.8.0 # via -r requirements/test.txt -pylint==3.0.2 +pylint==3.0.3 # via # -r requirements/test.txt # edx-lint @@ -302,6 +312,10 @@ rich==13.7.0 # via # -r requirements/test.txt # twine +secretstorage==3.3.3 + # via + # -r requirements/test.txt + # keyring six==1.16.0 # via # -r requirements/test.txt @@ -343,7 +357,7 @@ tox==4.11.4 # via -r requirements/ci.txt twine==4.0.2 # via -r requirements/test.txt -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # -r requirements/test.txt # asgiref diff --git a/requirements/test.txt b/requirements/test.txt index 15fddaf..4ad5ca7 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -19,6 +19,7 @@ certifi==2023.11.17 cffi==1.16.0 # via # -r requirements/base.txt + # cryptography # pynacl charset-normalizer==3.3.2 # via @@ -39,6 +40,8 @@ coverage[toml]==7.3.2 # via # coverage # pytest-cov +cryptography==41.0.7 + # via secretstorage ddt==1.7.0 # via -r requirements/test.in dill==0.3.7 @@ -53,7 +56,7 @@ django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -79,10 +82,14 @@ importlib-resources==6.1.1 # via keyring iniconfig==2.0.0 # via pytest -isort==5.12.0 +isort==5.13.1 # via pylint jaraco-classes==3.3.0 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage jinja2==3.1.2 # via code-annotations keyring==24.3.0 @@ -131,7 +138,7 @@ pygments==2.17.2 # rich pyjwt==2.8.0 # via -r requirements/base.txt -pylint==3.0.2 +pylint==3.0.3 # via # edx-lint # pylint-celery @@ -186,6 +193,8 @@ rfc3986==2.0.0 # via twine rich==13.7.0 # via twine +secretstorage==3.3.3 + # via keyring six==1.16.0 # via # edx-lint @@ -212,7 +221,7 @@ tomlkit==0.12.3 # via pylint twine==4.0.2 # via -r requirements/test.in -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # -r requirements/base.txt # asgiref