From 8d5dc03bdf704278bf875ef675839f8a73ed80db Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 12 Dec 2023 10:22:06 -0500 Subject: [PATCH 1/5] chore: Updating Python Requirements --- requirements/base.txt | 12 ++++++------ requirements/celery50.txt | 2 +- requirements/ci.txt | 7 +++---- requirements/common_constraints.txt | 5 ----- requirements/dev.txt | 19 +++++++++---------- requirements/pip-tools.txt | 2 +- requirements/quality.txt | 16 +++++++--------- requirements/test.txt | 18 +++++++++--------- 8 files changed, 36 insertions(+), 45 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 21afb7911f..32ade3b8a0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -62,7 +62,7 @@ django-crum==0.7.9 # via # -r requirements/base.in # edx-django-utils -django-ipware==6.0.0 +django-ipware==6.0.2 # via -r requirements/base.in django-model-utils==4.3.1 # via @@ -72,7 +72,7 @@ django-simple-history==3.1.1 # via # -c requirements/constraints.txt # -r requirements/base.in -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/base.in # edx-django-utils @@ -94,7 +94,7 @@ edx-django-utils==5.9.0 # edx-rest-api-client # edx-when # event-tracking -edx-drf-extensions==9.0.0 +edx-drf-extensions==9.0.1 # via # -r requirements/base.in # edx-when @@ -125,11 +125,11 @@ markupsafe==2.1.3 # via # mako # xblock -newrelic==9.2.0 +newrelic==9.3.0 # via edx-django-utils pbr==6.0.0 # via stevedore -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.42 # via click-repl psutil==5.9.6 # via edx-django-utils @@ -190,7 +190,7 @@ stevedore==5.1.0 # via # edx-django-utils # edx-opaque-keys -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # asgiref # edx-opaque-keys diff --git a/requirements/celery50.txt b/requirements/celery50.txt index 628f23d909..526b3bbcd5 100644 --- a/requirements/celery50.txt +++ b/requirements/celery50.txt @@ -5,5 +5,5 @@ click==8.1.7 click-didyoumean==0.3.0 click-repl==0.3.0 kombu==5.3.4 -prompt-toolkit==3.0.41 +prompt-toolkit==3.0.42 vine==5.1.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 89bb7ec628..651f6983be 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -12,7 +12,7 @@ colorama==0.4.6 # via tox coverage==7.3.2 # via -r requirements/ci.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via @@ -22,9 +22,8 @@ packaging==23.2 # via # pyproject-api # tox -platformdirs==3.11.0 +platformdirs==4.1.0 # via - # -c requirements/common_constraints.txt # tox # virtualenv pluggy==1.3.0 @@ -37,5 +36,5 @@ tomli==2.0.1 # tox tox==4.11.4 # via -r requirements/ci.in -virtualenv==20.24.7 +virtualenv==20.25.0 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 0cc87d8f01..974e750daf 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -26,8 +26,3 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected - -# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version -# This constraint can be removed once the issue -# https://github.com/pypa/virtualenv/issues/2666 gets resolved -platformdirs<4.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index d222ec4a3c..d7db08ab2b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,7 +8,7 @@ annotated-types==0.6.0 # via pydantic asgiref==3.7.2 # via django -astroid==3.0.1 +astroid==3.0.2 # via # pylint # pylint-celery @@ -37,7 +37,7 @@ diff-cover==8.0.1 # via -r requirements/dev.in dill==0.3.7 # via pylint -distlib==0.3.7 +distlib==0.3.8 # via virtualenv django==3.2.23 # via @@ -57,11 +57,11 @@ filelock==3.13.1 # via # tox # virtualenv -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via # rstcheck # rstcheck-core -isort==5.12.0 +isort==5.13.1 # via # -r requirements/quality.in # pylint @@ -83,7 +83,7 @@ packaging==23.2 # via # pyproject-api # tox -path==16.7.1 +path==16.9.0 # via # edx-i18n-tools # path-py @@ -91,9 +91,8 @@ path-py==12.5.0 # via -r requirements/dev.in pbr==6.0.0 # via stevedore -platformdirs==3.11.0 +platformdirs==4.1.0 # via - # -c requirements/common_constraints.txt # pylint # tox # virtualenv @@ -115,7 +114,7 @@ pygments==2.17.2 # via # diff-cover # rich -pylint==3.0.2 +pylint==3.0.3 # via # edx-lint # pylint-celery @@ -170,7 +169,7 @@ typer[all]==0.9.0 # via # rstcheck # typer -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # annotated-types # asgiref @@ -182,7 +181,7 @@ typing-extensions==4.8.0 # rstcheck # rstcheck-core # typer -virtualenv==20.24.7 +virtualenv==20.25.0 # via tox wheel==0.42.0 # via -r requirements/dev.in diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index c2a88cae1c..8d07fb6ee6 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via build packaging==23.2 # via build diff --git a/requirements/quality.txt b/requirements/quality.txt index 0178eb2691..3b45e5b2a2 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -8,7 +8,7 @@ annotated-types==0.6.0 # via pydantic asgiref==3.7.2 # via django -astroid==3.0.1 +astroid==3.0.2 # via # pylint # pylint-celery @@ -35,11 +35,11 @@ docutils==0.20.1 # via rstcheck-core edx-lint==5.3.6 # via -r requirements/quality.in -importlib-metadata==6.8.0 +importlib-metadata==7.0.0 # via # rstcheck # rstcheck-core -isort==5.12.0 +isort==5.13.1 # via # -r requirements/quality.in # pylint @@ -55,10 +55,8 @@ mdurl==0.1.2 # via markdown-it-py pbr==6.0.0 # via stevedore -platformdirs==3.11.0 - # via - # -c requirements/common_constraints.txt - # pylint +platformdirs==4.1.0 + # via pylint pycodestyle==2.11.1 # via -r requirements/quality.in pydantic==2.5.2 @@ -69,7 +67,7 @@ pydocstyle==6.3.0 # via -r requirements/quality.in pygments==2.17.2 # via rich -pylint==3.0.2 +pylint==3.0.3 # via # edx-lint # pylint-celery @@ -115,7 +113,7 @@ typer[all]==0.9.0 # via # rstcheck # typer -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # annotated-types # asgiref diff --git a/requirements/test.txt b/requirements/test.txt index d89b60f17d..52bc00ea0d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -65,7 +65,7 @@ django-crum==0.7.9 # via # -r requirements/base.in # edx-django-utils -django-ipware==6.0.0 +django-ipware==6.0.2 # via -r requirements/base.in django-model-utils==4.3.1 # via @@ -75,7 +75,7 @@ django-simple-history==3.1.1 # via # -c requirements/constraints.txt # -r requirements/base.in -django-waffle==4.0.0 +django-waffle==4.1.0 # via # -r requirements/base.in # edx-django-utils @@ -96,7 +96,7 @@ edx-django-utils==5.9.0 # edx-rest-api-client # edx-when # event-tracking -edx-drf-extensions==9.0.0 +edx-drf-extensions==9.0.1 # via # -r requirements/base.in # edx-when @@ -117,7 +117,7 @@ exceptiongroup==1.2.0 # via pytest execnet==2.0.2 # via pytest-xdist -freezegun==1.2.2 +freezegun==1.3.1 # via -r requirements/test.in fs==2.4.16 # via xblock @@ -127,7 +127,7 @@ httpretty==1.1.4 # via -r requirements/test.in idna==3.6 # via requests -importlib-metadata==6.8.0 +importlib-metadata==6.11.0 # via logilab-common iniconfig==2.0.0 # via pytest @@ -136,7 +136,7 @@ jinja2==3.1.2 jsonfield==3.1.0 # via -r requirements/base.in # via celery -logilab-common==1.11.0 +logilab-common==2.0.0 # via -r requirements/test.in lxml==4.9.3 # via @@ -153,11 +153,11 @@ mock==5.1.0 # via -r requirements/test.in mypy-extensions==1.0.0 # via logilab-common -newrelic==9.2.0 +newrelic==9.3.0 # via edx-django-utils packaging==23.2 # via pytest -path==16.7.1 +path==16.9.0 # via edx-i18n-tools pbr==6.0.0 # via stevedore @@ -256,7 +256,7 @@ tomli==2.0.1 # via # coverage # pytest -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # asgiref # edx-opaque-keys From a8a17961bc39ece9457af0b1f9d82d52df486e44 Mon Sep 17 00:00:00 2001 From: ilee2u Date: Fri, 15 Dec 2023 14:55:27 -0500 Subject: [PATCH 2/5] fix: test importlib-metadata v7 --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index 52bc00ea0d..b33f586be9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -127,7 +127,7 @@ httpretty==1.1.4 # via -r requirements/test.in idna==3.6 # via requests -importlib-metadata==6.11.0 +importlib-metadata==7.0.0 # via logilab-common iniconfig==2.0.0 # via pytest From ae54da102eecd4a62aad6b5dd69ae10172f776bf Mon Sep 17 00:00:00 2001 From: ilee2u Date: Fri, 15 Dec 2023 15:03:58 -0500 Subject: [PATCH 3/5] chore: putting it back --- requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test.txt b/requirements/test.txt index b33f586be9..52bc00ea0d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -127,7 +127,7 @@ httpretty==1.1.4 # via -r requirements/test.in idna==3.6 # via requests -importlib-metadata==7.0.0 +importlib-metadata==6.11.0 # via logilab-common iniconfig==2.0.0 # via pytest From 73e687b4d5ca7ace4ec3a44a417665b1f89cb9c3 Mon Sep 17 00:00:00 2001 From: ilee2u Date: Fri, 15 Dec 2023 15:04:44 -0500 Subject: [PATCH 4/5] chore: test of quality pkg --- requirements/quality.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/quality.txt b/requirements/quality.txt index 3b45e5b2a2..8ef7792a3e 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -35,7 +35,7 @@ docutils==0.20.1 # via rstcheck-core edx-lint==5.3.6 # via -r requirements/quality.in -importlib-metadata==7.0.0 +importlib-metadata==6.1.0 # via # rstcheck # rstcheck-core From 5ac2dd9e660cf40b1605da1af2c89a4e11f11e92 Mon Sep 17 00:00:00 2001 From: ilee2u Date: Fri, 15 Dec 2023 15:05:32 -0500 Subject: [PATCH 5/5] chore: fix version --- requirements/quality.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/quality.txt b/requirements/quality.txt index 8ef7792a3e..a82bfd8c26 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -35,7 +35,7 @@ docutils==0.20.1 # via rstcheck-core edx-lint==5.3.6 # via -r requirements/quality.in -importlib-metadata==6.1.0 +importlib-metadata==6.11.0 # via # rstcheck # rstcheck-core