From f15e29a42aeffdc58dc8146363f1bf9cd8b923ae Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 9 Feb 2022 21:38:44 +0500 Subject: [PATCH] feat!: Dropped django22 support. (#120) * feat!: dropped django2.2 support. Upgrade package. --- .github/workflows/ci.yml | 4 +- edxsearch/__init__.py | 2 +- requirements/base.txt | 45 ++++++++---- requirements/ci.txt | 30 ++++---- requirements/constraints.txt | 4 +- requirements/dev.txt | 134 ++++++++++++++++++++++------------- requirements/pip-tools.txt | 14 ++-- requirements/pip.txt | 6 +- requirements/quality.txt | 106 +++++++++++++++++---------- requirements/testing.txt | 77 ++++++++++++++------ tox.ini | 7 +- 11 files changed, 268 insertions(+), 161 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df5d4d98..556733e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django22, django30, django31, django32, quality] + toxenv: [django32, quality] steps: - uses: actions/checkout@v2 @@ -39,7 +39,7 @@ jobs: run: sleep 10 && tox - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django22' + if: matrix.python-version == '3.8' && matrix.toxenv=='django32' uses: codecov/codecov-action@v1 with: flags: unittests diff --git a/edxsearch/__init__.py b/edxsearch/__init__.py index c9b97b4f..6020c5ce 100644 --- a/edxsearch/__init__.py +++ b/edxsearch/__init__.py @@ -1,3 +1,3 @@ """ Container module for testing / demoing search """ -__version__ = '3.1.0' +__version__ = '4.0.0' diff --git a/requirements/base.txt b/requirements/base.txt index e0722b3d..44a4f47a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,45 +4,60 @@ # # make upgrade # -amqp==5.0.6 +amqp==5.0.9 # via kombu +asgiref==3.5.0 + # via django billiard==3.6.4.0 # via celery -celery==5.1.2 +celery==5.2.3 # via event-tracking -certifi==2021.5.30 +certifi==2021.10.8 # via elasticsearch -click==7.1.2 +click==8.0.3 # via - # -c requirements/constraints.txt # celery # click-didyoumean # click-plugins # click-repl -click-didyoumean==0.0.3 +click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery click-repl==0.2.0 # via celery -django==2.2.24 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in + # django-crum + # edx-django-utils # event-tracking +django-crum==0.7.9 + # via edx-django-utils +django-waffle==2.3.0 + # via edx-django-utils +edx-django-utils==4.5.0 + # via event-tracking elasticsearch==7.13.4 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in -event-tracking==1.1.0 +event-tracking==2.0.0 # via -r requirements/base.in -kombu==5.1.0 +kombu==5.2.3 # via celery -prompt-toolkit==3.0.20 +newrelic==7.4.0.172 + # via edx-django-utils +pbr==5.8.1 + # via stevedore +prompt-toolkit==3.0.27 # via click-repl -pymongo==3.12.0 +psutil==5.9.0 + # via edx-django-utils +pymongo==3.12.3 # via event-tracking -pytz==2021.1 +pytz==2021.3 # via # celery # django @@ -51,9 +66,11 @@ six==1.16.0 # via # click-repl # event-tracking -sqlparse==0.4.1 +sqlparse==0.4.2 # via django -urllib3==1.26.6 +stevedore==3.5.0 + # via edx-django-utils +urllib3==1.26.8 # via elasticsearch vine==5.0.0 # via diff --git a/requirements/ci.txt b/requirements/ci.txt index 93e1d3af..6ce50fad 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,35 +4,33 @@ # # make upgrade # -backports.entry-points-selectable==1.1.0 - # via virtualenv -certifi==2021.5.30 +certifi==2021.10.8 # via requests -charset-normalizer==2.0.4 +charset-normalizer==2.0.11 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==5.5 +coverage==6.3.1 # via codecov -distlib==0.3.2 +distlib==0.3.4 # via virtualenv -filelock==3.0.12 +filelock==3.4.2 # via # tox # virtualenv -idna==3.2 +idna==3.3 # via requests -packaging==21.0 +packaging==21.3 # via tox -platformdirs==2.3.0 +platformdirs==2.4.1 # via virtualenv pluggy==1.0.0 # via tox -py==1.10.0 +py==1.11.0 # via tox -pyparsing==2.4.7 +pyparsing==3.0.7 # via packaging -requests==2.26.0 +requests==2.27.1 # via codecov six==1.16.0 # via @@ -40,9 +38,9 @@ six==1.16.0 # virtualenv toml==0.10.2 # via tox -tox==3.24.3 +tox==3.24.5 # via -r requirements/ci.in -urllib3==1.26.6 +urllib3==1.26.8 # via requests -virtualenv==20.7.2 +virtualenv==20.13.1 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 3464443b..7c8a02cb 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,5 +16,5 @@ # ddt >= 1.4.0 causing test failures ddt < 1.4.0 -# pip-tools fetches latest version of click which is in-compatible with celery & more packages -click < 8.0 \ No newline at end of file +# greater version breaking quality build. fix in separate PR. +pylint==2.10.2 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 0379029f..d3bb5d16 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,49 +4,49 @@ # # make upgrade # -amqp==5.0.6 +amqp==5.0.9 # via # -r requirements/quality.txt # -r requirements/testing.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # django astroid==2.7.3 # via # -r requirements/quality.txt # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/quality.txt # -r requirements/testing.txt # pytest -backports.entry-points-selectable==1.1.0 - # via - # -r requirements/ci.txt - # virtualenv billiard==3.6.4.0 # via # -r requirements/quality.txt # -r requirements/testing.txt # celery -celery==5.1.2 +celery==5.2.3 # via # -r requirements/quality.txt # -r requirements/testing.txt # event-tracking -certifi==2021.5.30 +certifi==2021.10.8 # via # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/testing.txt # elasticsearch # requests -charset-normalizer==2.0.4 +charset-normalizer==2.0.11 # via # -r requirements/ci.txt # requests -click==7.1.2 +click==8.0.3 # via - # -c requirements/constraints.txt # -r requirements/pip-tools.txt # -r requirements/quality.txt # -r requirements/testing.txt @@ -58,7 +58,7 @@ click==7.1.2 # code-annotations # edx-lint # pip-tools -click-didyoumean==0.0.3 +click-didyoumean==0.3.0 # via # -r requirements/quality.txt # -r requirements/testing.txt @@ -77,13 +77,13 @@ click-repl==0.2.0 # -r requirements/quality.txt # -r requirements/testing.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via # -r requirements/quality.txt # edx-lint codecov==2.1.12 # via -r requirements/ci.txt -coverage==5.5 +coverage[toml]==6.3.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -95,33 +95,50 @@ ddt==1.3.1 # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/testing.txt -distlib==0.3.2 +distlib==0.3.4 # via # -r requirements/ci.txt # virtualenv -django==2.2.24 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # -r requirements/testing.txt + # django-crum + # edx-django-utils # event-tracking -edx-lint==5.1.0 +django-crum==0.7.9 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # edx-django-utils +django-waffle==2.3.0 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # edx-django-utils +edx-django-utils==4.5.0 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # event-tracking +edx-lint==5.2.1 # via -r requirements/quality.txt elasticsearch==7.13.4 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # -r requirements/testing.txt -event-tracking==1.1.0 +event-tracking==2.0.0 # via # -r requirements/quality.txt # -r requirements/testing.txt -filelock==3.0.12 +filelock==3.4.2 # via # -r requirements/ci.txt # tox # virtualenv -idna==3.2 +idna==3.3 # via # -r requirements/ci.txt # requests @@ -130,20 +147,20 @@ iniconfig==1.1.1 # -r requirements/quality.txt # -r requirements/testing.txt # pytest -isort==5.9.3 +isort==5.10.1 # via # -r requirements/quality.txt # pylint -jinja2==3.0.1 +jinja2==3.0.3 # via # -r requirements/quality.txt # code-annotations -kombu==5.1.0 +kombu==5.2.3 # via # -r requirements/quality.txt # -r requirements/testing.txt # celery -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via # -r requirements/quality.txt # astroid @@ -159,24 +176,30 @@ mock==4.0.3 # via # -r requirements/quality.txt # -r requirements/testing.txt -packaging==21.0 +newrelic==7.4.0.172 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # edx-django-utils +packaging==21.3 # via # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/testing.txt # pytest # tox -pbr==5.6.0 +pbr==5.8.1 # via # -r requirements/quality.txt + # -r requirements/testing.txt # stevedore -pep517==0.11.0 +pep517==0.12.0 # via # -r requirements/pip-tools.txt # pip-tools -pip-tools==6.2.0 +pip-tools==6.5.1 # via -r requirements/pip-tools.txt -platformdirs==2.3.0 +platformdirs==2.4.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -189,22 +212,28 @@ pluggy==1.0.0 # -r requirements/testing.txt # pytest # tox -prompt-toolkit==3.0.20 +prompt-toolkit==3.0.27 # via # -r requirements/quality.txt # -r requirements/testing.txt # click-repl -py==1.10.0 +psutil==5.9.0 + # via + # -r requirements/quality.txt + # -r requirements/testing.txt + # edx-django-utils +py==1.11.0 # via # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/testing.txt # pytest # tox -pycodestyle==2.7.0 +pycodestyle==2.8.0 # via -r requirements/quality.txt pylint==2.10.2 # via + # -c requirements/constraints.txt # -r requirements/quality.txt # edx-lint # pylint-celery @@ -214,32 +243,32 @@ pylint-celery==0.3 # via # -r requirements/quality.txt # edx-lint -pylint-django==2.4.4 +pylint-django==2.5.0 # via # -r requirements/quality.txt # edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # -r requirements/quality.txt # pylint-celery # pylint-django -pymongo==3.12.0 +pymongo==3.12.3 # via # -r requirements/quality.txt # -r requirements/testing.txt # event-tracking -pyparsing==2.4.7 +pyparsing==3.0.7 # via # -r requirements/ci.txt # -r requirements/quality.txt # -r requirements/testing.txt # packaging -pytest==6.2.5 +pytest==7.0.0 # via # -r requirements/quality.txt # -r requirements/testing.txt # pytest-cov -pytest-cov==2.12.1 +pytest-cov==3.0.0 # via # -r requirements/quality.txt # -r requirements/testing.txt @@ -247,18 +276,18 @@ python-slugify==5.0.2 # via # -r requirements/quality.txt # code-annotations -pytz==2021.1 +pytz==2021.3 # via # -r requirements/quality.txt # -r requirements/testing.txt # celery # django # event-tracking -pyyaml==5.4.1 +pyyaml==6.0 # via # -r requirements/quality.txt # code-annotations -requests==2.26.0 +requests==2.27.1 # via # -r requirements/ci.txt # codecov @@ -272,15 +301,17 @@ six==1.16.0 # event-tracking # tox # virtualenv -sqlparse==0.4.1 +sqlparse==0.4.2 # via # -r requirements/quality.txt # -r requirements/testing.txt # django -stevedore==3.4.0 +stevedore==3.5.0 # via # -r requirements/quality.txt + # -r requirements/testing.txt # code-annotations + # edx-django-utils text-unidecode==1.3 # via # -r requirements/quality.txt @@ -289,18 +320,19 @@ toml==0.10.2 # via # -r requirements/ci.txt # -r requirements/quality.txt - # -r requirements/testing.txt # pylint - # pytest - # pytest-cov # tox -tomli==1.2.1 +tomli==2.0.1 # via # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # -r requirements/testing.txt + # coverage # pep517 -tox==3.24.3 + # pytest +tox==3.24.5 # via -r requirements/ci.txt -urllib3==1.26.6 +urllib3==1.26.8 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -314,7 +346,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.7.2 +virtualenv==20.13.1 # via # -r requirements/ci.txt # tox @@ -323,7 +355,7 @@ wcwidth==0.2.5 # -r requirements/quality.txt # -r requirements/testing.txt # prompt-toolkit -wheel==0.37.0 +wheel==0.37.1 # via # -r requirements/pip-tools.txt # pip-tools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 7b7afae4..2a6effac 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,17 +4,15 @@ # # make upgrade # -click==7.1.2 - # via - # -c requirements/constraints.txt - # pip-tools -pep517==0.11.0 +click==8.0.3 # via pip-tools -pip-tools==6.2.0 +pep517==0.12.0 + # via pip-tools +pip-tools==6.5.1 # via -r requirements/pip-tools.in -tomli==1.2.1 +tomli==2.0.1 # via pep517 -wheel==0.37.0 +wheel==0.37.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 36c04ed3..959d9fc9 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.37.0 +wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==21.2.4 +pip==22.0.3 # via -r requirements/pip.in -setuptools==57.4.0 +setuptools==60.8.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 5d099623..508bb661 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,15 +4,19 @@ # # make upgrade # -amqp==5.0.6 +amqp==5.0.9 # via # -r requirements/testing.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/testing.txt + # django astroid==2.7.3 # via # pylint # pylint-celery -attrs==21.2.0 +attrs==21.4.0 # via # -r requirements/testing.txt # pytest @@ -20,17 +24,16 @@ billiard==3.6.4.0 # via # -r requirements/testing.txt # celery -celery==5.1.2 +celery==5.2.3 # via # -r requirements/testing.txt # event-tracking -certifi==2021.5.30 +certifi==2021.10.8 # via # -r requirements/testing.txt # elasticsearch -click==7.1.2 +click==8.0.3 # via - # -c requirements/constraints.txt # -r requirements/testing.txt # celery # click-didyoumean @@ -39,7 +42,7 @@ click==7.1.2 # click-repl # code-annotations # edx-lint -click-didyoumean==0.0.3 +click-didyoumean==0.3.0 # via # -r requirements/testing.txt # celery @@ -53,9 +56,9 @@ click-repl==0.2.0 # via # -r requirements/testing.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via edx-lint -coverage==5.5 +coverage[toml]==6.3.1 # via # -r requirements/quality.in # -r requirements/testing.txt @@ -64,32 +67,46 @@ ddt==1.3.1 # via # -c requirements/constraints.txt # -r requirements/testing.txt -django==2.2.24 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/testing.txt + # django-crum + # edx-django-utils # event-tracking -edx-lint==5.1.0 +django-crum==0.7.9 + # via + # -r requirements/testing.txt + # edx-django-utils +django-waffle==2.3.0 + # via + # -r requirements/testing.txt + # edx-django-utils +edx-django-utils==4.5.0 + # via + # -r requirements/testing.txt + # event-tracking +edx-lint==5.2.1 # via -r requirements/quality.in elasticsearch==7.13.4 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/testing.txt -event-tracking==1.1.0 +event-tracking==2.0.0 # via -r requirements/testing.txt iniconfig==1.1.1 # via # -r requirements/testing.txt # pytest -isort==5.9.3 +isort==5.10.1 # via pylint -jinja2==3.0.1 +jinja2==3.0.3 # via code-annotations -kombu==5.1.0 +kombu==5.2.3 # via # -r requirements/testing.txt # celery -lazy-object-proxy==1.6.0 +lazy-object-proxy==1.7.1 # via astroid markupsafe==2.0.1 # via jinja2 @@ -97,65 +114,76 @@ mccabe==0.6.1 # via pylint mock==4.0.3 # via -r requirements/testing.txt -packaging==21.0 +newrelic==7.4.0.172 + # via + # -r requirements/testing.txt + # edx-django-utils +packaging==21.3 # via # -r requirements/testing.txt # pytest -pbr==5.6.0 - # via stevedore -platformdirs==2.3.0 +pbr==5.8.1 + # via + # -r requirements/testing.txt + # stevedore +platformdirs==2.4.1 # via pylint pluggy==1.0.0 # via # -r requirements/testing.txt # pytest -prompt-toolkit==3.0.20 +prompt-toolkit==3.0.27 # via # -r requirements/testing.txt # click-repl -py==1.10.0 +psutil==5.9.0 + # via + # -r requirements/testing.txt + # edx-django-utils +py==1.11.0 # via # -r requirements/testing.txt # pytest -pycodestyle==2.7.0 +pycodestyle==2.8.0 # via -r requirements/quality.in pylint==2.10.2 # via + # -c requirements/constraints.txt # edx-lint # pylint-celery # pylint-django # pylint-plugin-utils pylint-celery==0.3 # via edx-lint -pylint-django==2.4.4 +pylint-django==2.5.0 # via edx-lint -pylint-plugin-utils==0.6 +pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django -pymongo==3.12.0 +pymongo==3.12.3 # via # -r requirements/testing.txt # event-tracking -pyparsing==2.4.7 +pyparsing==3.0.7 # via # -r requirements/testing.txt # packaging -pytest==6.2.5 +pytest==7.0.0 # via # -r requirements/testing.txt # pytest-cov -pytest-cov==2.12.1 +pytest-cov==3.0.0 # via -r requirements/testing.txt python-slugify==5.0.2 # via code-annotations -pytz==2021.1 +pytz==2021.3 # via # -r requirements/testing.txt # celery # django # event-tracking -pyyaml==5.4.1 +pyyaml==6.0 # via code-annotations six==1.16.0 # via @@ -163,21 +191,25 @@ six==1.16.0 # click-repl # edx-lint # event-tracking -sqlparse==0.4.1 +sqlparse==0.4.2 # via # -r requirements/testing.txt # django -stevedore==3.4.0 - # via code-annotations +stevedore==3.5.0 + # via + # -r requirements/testing.txt + # code-annotations + # edx-django-utils text-unidecode==1.3 # via python-slugify toml==0.10.2 + # via pylint +tomli==2.0.1 # via # -r requirements/testing.txt - # pylint + # coverage # pytest - # pytest-cov -urllib3==1.26.6 +urllib3==1.26.8 # via # -r requirements/testing.txt # elasticsearch diff --git a/requirements/testing.txt b/requirements/testing.txt index 6be40e25..e95cc686 100644 --- a/requirements/testing.txt +++ b/requirements/testing.txt @@ -4,33 +4,36 @@ # # make upgrade # -amqp==5.0.6 +amqp==5.0.9 # via # -r requirements/base.txt # kombu -attrs==21.2.0 +asgiref==3.5.0 + # via + # -r requirements/base.txt + # django +attrs==21.4.0 # via pytest billiard==3.6.4.0 # via # -r requirements/base.txt # celery -celery==5.1.2 +celery==5.2.3 # via # -r requirements/base.txt # event-tracking -certifi==2021.5.30 +certifi==2021.10.8 # via # -r requirements/base.txt # elasticsearch -click==7.1.2 +click==8.0.3 # via - # -c requirements/constraints.txt # -r requirements/base.txt # celery # click-didyoumean # click-plugins # click-repl -click-didyoumean==0.0.3 +click-didyoumean==0.3.0 # via # -r requirements/base.txt # celery @@ -42,7 +45,7 @@ click-repl==0.2.0 # via # -r requirements/base.txt # celery -coverage==5.5 +coverage[toml]==6.3.1 # via # -r requirements/testing.in # pytest-cov @@ -53,42 +56,68 @@ ddt==1.3.1 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt + # django-crum + # edx-django-utils + # event-tracking +django-crum==0.7.9 + # via + # -r requirements/base.txt + # edx-django-utils +django-waffle==2.3.0 + # via + # -r requirements/base.txt + # edx-django-utils +edx-django-utils==4.5.0 + # via + # -r requirements/base.txt # event-tracking elasticsearch==7.13.4 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt -event-tracking==1.1.0 +event-tracking==2.0.0 # via -r requirements/base.txt iniconfig==1.1.1 # via pytest -kombu==5.1.0 +kombu==5.2.3 # via # -r requirements/base.txt # celery mock==4.0.3 # via -r requirements/testing.in -packaging==21.0 +newrelic==7.4.0.172 + # via + # -r requirements/base.txt + # edx-django-utils +packaging==21.3 # via pytest +pbr==5.8.1 + # via + # -r requirements/base.txt + # stevedore pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.20 +prompt-toolkit==3.0.27 # via # -r requirements/base.txt # click-repl -py==1.10.0 +psutil==5.9.0 + # via + # -r requirements/base.txt + # edx-django-utils +py==1.11.0 # via pytest -pymongo==3.12.0 +pymongo==3.12.3 # via # -r requirements/base.txt # event-tracking -pyparsing==2.4.7 +pyparsing==3.0.7 # via packaging -pytest==6.2.5 +pytest==7.0.0 # via pytest-cov -pytest-cov==2.12.1 +pytest-cov==3.0.0 # via -r requirements/testing.in -pytz==2021.1 +pytz==2021.3 # via # -r requirements/base.txt # celery @@ -99,15 +128,19 @@ six==1.16.0 # -r requirements/base.txt # click-repl # event-tracking -sqlparse==0.4.1 +sqlparse==0.4.2 # via # -r requirements/base.txt # django -toml==0.10.2 +stevedore==3.5.0 # via + # -r requirements/base.txt + # edx-django-utils +tomli==2.0.1 + # via + # coverage # pytest - # pytest-cov -urllib3==1.26.6 +urllib3==1.26.8 # via # -r requirements/base.txt # elasticsearch diff --git a/tox.ini b/tox.ini index 10f39f04..a5d30f48 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,11 @@ [tox] -envlist = py38-django{22,30,31,32},quality +envlist = py38-django{32},quality [testenv] setenv = DJANGO_SETTINGS_MODULE = edxsearch.settings PYTHONPATH = {toxinidir} -deps = - django22: Django>=2.2,<2.3 - django30: Django>=3.0,<3.1 - django31: Django>=3.1,<3.2 +deps = django32: Django>=3.2,<4.0 -r {toxinidir}/requirements/testing.txt commands =