From 52dc8b66100196ade8ec2177e7145b4231a1e54c Mon Sep 17 00:00:00 2001 From: salmannawaz Date: Mon, 20 Nov 2023 20:51:16 +0500 Subject: [PATCH] chore: remove bok-choy (#1165) * chore: remove bok-choy and selenium and related tests --- requirements/base.txt | 18 ++++++------ requirements/celery50.txt | 6 ++-- requirements/ci.txt | 27 +++++++++++------ requirements/common_constraints.txt | 7 +++-- requirements/dev.txt | 45 +++++++++++++++++------------ requirements/quality.txt | 16 +++++----- requirements/test.in | 2 -- requirements/test.txt | 29 +++++++------------ tox.ini | 2 +- 9 files changed, 80 insertions(+), 72 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 282e38d557b..c6beed8773f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,7 +16,7 @@ backports-zoneinfo[tzdata]==0.2.1 # kombu billiard==4.2.0 # via celery -celery==5.3.4 +celery==5.3.5 # via # -c requirements/constraints.txt # event-tracking @@ -94,7 +94,7 @@ edx-django-utils==5.8.0 # edx-rest-api-client # edx-when # event-tracking -edx-drf-extensions==8.13.0 +edx-drf-extensions==8.13.1 # via # -r requirements/base.in # edx-when @@ -115,21 +115,21 @@ idna==3.4 # via requests jsonfield==3.1.0 # via -r requirements/base.in -kombu==5.3.3 +kombu==5.3.4 # via celery lxml==4.9.3 # via xblock -mako==1.2.4 +mako==1.3.0 # via xblock markupsafe==2.1.3 # via # mako # xblock -newrelic==9.1.1 +newrelic==9.2.0 # via edx-django-utils -pbr==5.11.1 +pbr==6.0.0 # via stevedore -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.41 # via click-repl psutil==5.9.6 # via edx-django-utils @@ -197,14 +197,14 @@ tzdata==2023.3 # via # backports-zoneinfo # celery -urllib3==2.0.7 +urllib3==2.1.0 # via requests vine==5.1.0 # via # amqp # celery # kombu -wcwidth==0.2.9 +wcwidth==0.2.10 # via prompt-toolkit web-fragments==2.1.0 # via xblock diff --git a/requirements/celery50.txt b/requirements/celery50.txt index f5e6e328aad..58032450f06 100644 --- a/requirements/celery50.txt +++ b/requirements/celery50.txt @@ -1,9 +1,9 @@ amqp==5.2.0 billiard==4.2.0 -celery==5.3.4 +celery==5.3.5 click==8.1.7 click-didyoumean==0.3.0 click-repl==0.3.0 -kombu==5.3.3 -prompt-toolkit==3.0.39 +kombu==5.3.4 +prompt-toolkit==3.0.41 vine==5.1.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index aafebe11768..76cc6c7aa80 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 coverage==7.3.2 # via -r requirements/ci.in distlib==0.3.7 @@ -13,20 +19,23 @@ filelock==3.13.1 # tox # virtualenv packaging==23.2 - # via tox + # via + # pyproject-api + # tox platformdirs==3.11.0 - # via virtualenv + # via + # -c requirements/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 tox -tox==3.28.0 # via - # -c requirements/common_constraints.txt - # -r requirements/ci.in + # pyproject-api + # tox +tox==4.11.3 + # via -r requirements/ci.in virtualenv==20.24.6 # via tox diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 18ff1b20a0c..0cc87d8f015 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -27,6 +27,7 @@ elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. -# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 -tox<4.0.0 +# 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 cb2221275b2..8226cd5ebad 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,8 +12,12 @@ astroid==3.0.1 # via # pylint # pylint-celery +cachetools==5.3.2 + # via tox chardet==5.2.0 - # via diff-cover + # via + # diff-cover + # tox click==8.1.7 # via # -c requirements/constraints.txt @@ -26,8 +30,10 @@ click-log==0.4.0 code-annotations==1.5.0 # via edx-lint colorama==0.4.6 - # via typer -diff-cover==8.0.0 + # via + # tox + # typer +diff-cover==8.0.1 # via -r requirements/dev.in dill==0.3.7 # via pylint @@ -74,18 +80,22 @@ mccabe==0.7.0 mdurl==0.1.2 # via markdown-it-py packaging==23.2 - # via tox + # via + # pyproject-api + # tox path==16.7.1 # via # edx-i18n-tools # path-py path-py==12.5.0 # via -r requirements/dev.in -pbr==5.11.1 +pbr==6.0.0 # via stevedore platformdirs==3.11.0 # via + # -c requirements/common_constraints.txt # pylint + # tox # virtualenv pluggy==1.3.0 # via @@ -93,13 +103,11 @@ pluggy==1.3.0 # tox polib==1.2.0 # via edx-i18n-tools -py==1.11.0 - # via tox pycodestyle==2.11.1 # via -r requirements/quality.in -pydantic==2.4.2 +pydantic==2.5.1 # via rstcheck-core -pydantic-core==2.10.1 +pydantic-core==2.14.3 # via pydantic pydocstyle==6.3.0 # via -r requirements/quality.in @@ -121,6 +129,8 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django +pyproject-api==1.6.1 + # via tox python-slugify==8.0.1 # via code-annotations pytz==2023.3.post1 @@ -129,18 +139,16 @@ pyyaml==6.0.1 # via # code-annotations # edx-i18n-tools -rich==13.6.0 +rich==13.7.0 # via typer rstcheck==6.2.0 # via -r requirements/quality.in -rstcheck-core==1.1.1 +rstcheck-core==1.2.0 # via rstcheck shellingham==1.5.4 # via typer six==1.16.0 - # via - # edx-lint - # tox + # via edx-lint snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.4 @@ -152,13 +160,12 @@ text-unidecode==1.3 tomli==2.0.1 # via # pylint + # pyproject-api # tox -tomlkit==0.12.2 +tomlkit==0.12.3 # via pylint -tox==3.28.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/dev.in +tox==4.11.3 + # via -r requirements/dev.in typer[all]==0.9.0 # via # rstcheck diff --git a/requirements/quality.txt b/requirements/quality.txt index 8cf30aaa309..a6904c6306b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -53,15 +53,17 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -pbr==5.11.1 +pbr==6.0.0 # via stevedore platformdirs==3.11.0 - # via pylint + # via + # -c requirements/common_constraints.txt + # pylint pycodestyle==2.11.1 # via -r requirements/quality.in -pydantic==2.4.2 +pydantic==2.5.1 # via rstcheck-core -pydantic-core==2.10.1 +pydantic-core==2.14.3 # via pydantic pydocstyle==6.3.0 # via -r requirements/quality.in @@ -87,11 +89,11 @@ pytz==2023.3.post1 # via django pyyaml==6.0.1 # via code-annotations -rich==13.6.0 +rich==13.7.0 # via typer rstcheck==6.2.0 # via -r requirements/quality.in -rstcheck-core==1.1.1 +rstcheck-core==1.2.0 # via rstcheck shellingham==1.5.4 # via typer @@ -107,7 +109,7 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.12.2 +tomlkit==0.12.3 # via pylint typer[all]==0.9.0 # via diff --git a/requirements/test.in b/requirements/test.in index 0d64a4eb258..ef9f4232b4b 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -3,7 +3,6 @@ -r base.in -bok-choy>=0.3.1 code-annotations>=0.3.1 ddt>=0.8.0 edx-i18n-tools # be able to run `make validate_translations` @@ -16,5 +15,4 @@ pytest-cov # pytest extension for code coverage statistics pytest-django # pytest extension for better Django support pytest-xdist # pytest extension for parallel execution responses -selenium>=2.45.0 testfixtures>=4.0.0 diff --git a/requirements/test.txt b/requirements/test.txt index 0263f258ac8..f3dbf191c82 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -14,8 +14,6 @@ backports-zoneinfo[tzdata]==0.2.1 # celery # kombu # via celery -bok-choy==2.0.2 - # via -r requirements/test.in # via # -c requirements/constraints.txt # event-tracking @@ -47,7 +45,7 @@ coverage[toml]==7.3.2 # pytest-cov cryptography==41.0.5 # via pyjwt -ddt==1.6.0 +ddt==1.7.0 # via -r requirements/test.in # via # -c requirements/common_constraints.txt @@ -98,7 +96,7 @@ edx-django-utils==5.8.0 # edx-rest-api-client # edx-when # event-tracking -edx-drf-extensions==8.13.0 +edx-drf-extensions==8.13.1 # via # -r requirements/base.in # edx-when @@ -138,15 +136,13 @@ jinja2==3.1.2 jsonfield==3.1.0 # via -r requirements/base.in # via celery -lazy==1.6 - # via bok-choy logilab-common==1.11.0 # via -r requirements/test.in lxml==4.9.3 # via # edx-i18n-tools # xblock -mako==1.2.4 +mako==1.3.0 # via xblock markupsafe==2.1.3 # via @@ -157,13 +153,13 @@ mock==5.1.0 # via -r requirements/test.in mypy-extensions==1.0.0 # via logilab-common -newrelic==9.1.1 +newrelic==9.2.0 # via edx-django-utils packaging==23.2 # via pytest path==16.7.1 # via edx-i18n-tools -pbr==5.11.1 +pbr==6.0.0 # via stevedore pluggy==1.3.0 # via pytest @@ -196,9 +192,9 @@ pytest==7.4.3 # pytest-xdist pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.6.0 +pytest-django==4.7.0 # via -r requirements/test.in -pytest-xdist==3.3.1 +pytest-xdist==3.4.0 # via -r requirements/test.in python-dateutil==2.8.2 # via @@ -228,14 +224,10 @@ requests==2.31.0 # httmock # responses # slumber -responses==0.24.0 +responses==0.24.1 # via -r requirements/test.in rules==3.3 # via -r requirements/base.in -selenium==3.141.0 - # via - # -r requirements/test.in - # bok-choy semantic-version==2.10.0 # via edx-drf-extensions simplejson==3.19.2 @@ -272,16 +264,15 @@ tzdata==2023.3 # via # backports-zoneinfo # celery -urllib3==2.0.7 +urllib3==2.1.0 # via # requests # responses - # selenium # via # amqp # celery # kombu -wcwidth==0.2.9 +wcwidth==0.2.10 # via prompt-toolkit web-fragments==2.1.0 # via xblock diff --git a/tox.ini b/tox.ini index b55574827e4..b2c62281a65 100644 --- a/tox.ini +++ b/tox.ini @@ -60,7 +60,7 @@ commands = deps = -r{toxinidir}/requirements/base.txt commands = - {toxinidir}/edx_proctoring/scripts/version_check.py + python {toxinidir}/edx_proctoring/scripts/version_check.py [testenv:pii_check] allowlist_externals =