From 9c37f7517b131d3f894a084109f2e245e0c9b42a Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Thu, 10 Feb 2022 12:43:04 +0500 Subject: [PATCH] chore: Post Django32 Cleanup --- .github/workflows/ci.yml | 5 +-- bulk_grades/api.py | 2 +- bulk_grades/urls.py | 8 ++-- docs/conf.py | 4 +- requirements/base.in | 1 - requirements/base.txt | 30 +++++++-------- requirements/celery50.txt | 2 +- requirements/ci.txt | 12 +++--- requirements/constraints.txt | 2 +- requirements/dev.txt | 46 ++++++++++++---------- requirements/doc.txt | 65 ++++++++++++++----------------- requirements/pii_check.txt | 30 ++++++++------- requirements/pip-tools.txt | 6 +-- requirements/pip.txt | 2 +- requirements/quality.txt | 46 +++++++++++----------- requirements/test.txt | 42 +++++++++++--------- tox.ini | 74 ++++++++++++++++++------------------ 17 files changed, 188 insertions(+), 189 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fe2c75..7ae8a22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,7 @@ jobs: matrix: os: [ubuntu-20.04] python-version: ['3.8'] - toxenv: [django22-celery44, django22-celery50, django30-celery50, django31-celery50, django32-celery50, - quality, docs, pii_check] + toxenv: [quality, docs, pii_check, django32, django40] steps: - uses: actions/checkout@v2 @@ -37,7 +36,7 @@ jobs: run: tox - name: Run Coverage - if: matrix.python-version == '3.8' && matrix.toxenv=='django22-celery44' + if: matrix.python-version == '3.8' && matrix.toxenv=='django32-celery44' uses: codecov/codecov-action@v1 with: flags: unittests diff --git a/bulk_grades/api.py b/bulk_grades/api.py index beec98c..84e42e1 100644 --- a/bulk_grades/api.py +++ b/bulk_grades/api.py @@ -12,7 +12,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.db.models import Exists, OuterRef from django.utils.functional import cached_property -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from lms.djangoapps.grades import api as grades_api from opaque_keys.edx.keys import CourseKey, UsageKey from openedx.core.djangoapps.course_groups.cohorts import get_cohort diff --git a/bulk_grades/urls.py b/bulk_grades/urls.py index 70fbb85..b137aa8 100644 --- a/bulk_grades/urls.py +++ b/bulk_grades/urls.py @@ -3,22 +3,22 @@ """ from django.conf import settings -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ - url( + re_path( fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/$', views.GradeImportExport.as_view(), name='bulk_grades' ), - url( + re_path( fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/history/$', views.GradeOperationHistoryView.as_view(), name='bulk_grades.history' ), - url( + re_path( fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/intervention/$', views.InterventionsExport.as_view(), name='interventions' diff --git a/docs/conf.py b/docs/conf.py index 5d9ddd9..d3dc1fd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -21,8 +21,6 @@ import edx_theme from django import setup as django_setup from django.conf import settings -from django.utils import six - def get_version(*file_paths): """ @@ -499,5 +497,5 @@ def on_init(app): # pylint: disable=unused-argument def setup(app): """Sphinx extension: run sphinx-apidoc.""" - event = 'builder-inited' if six.PY3 else b'builder-inited' + event = 'builder-inited' app.connect(event, on_init) diff --git a/requirements/base.in b/requirements/base.in index 750043b..1eec1ef 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -7,4 +7,3 @@ edx-opaque-keys super-csv requests slumber -six diff --git a/requirements/base.txt b/requirements/base.txt index 4f65a19..105ff46 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,11 +1,13 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade # amqp==5.0.9 # via kombu +asgiref==3.5.0 + # via django billiard==3.6.4.0 # via celery celery==5.2.3 @@ -14,7 +16,7 @@ celery==5.2.3 # edx-celeryutils certifi==2021.10.8 # via requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via requests click==8.0.3 # via @@ -28,7 +30,7 @@ click-plugins==1.1.1 # via celery click-repl==0.2.0 # via celery -django==2.2.26 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -49,15 +51,15 @@ django-model-utils==4.2.0 # -r requirements/base.in # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via edx-django-utils djangorestframework==3.13.1 # via super-csv -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via super-csv -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/base.in future==0.18.2 # via edx-celeryutils @@ -67,15 +69,15 @@ jsonfield==3.1.0 # via edx-celeryutils kombu==5.2.3 # via celery -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via edx-django-utils -pbr==5.8.0 +pbr==5.8.1 # via stevedore -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via click-repl psutil==5.9.0 # via edx-django-utils -pymongo==4.0.1 +pymongo==3.12.3 # via edx-opaque-keys pytz==2021.3 # via @@ -89,9 +91,7 @@ requests==2.27.1 simplejson==3.17.6 # via super-csv six==1.16.0 - # via - # -r requirements/base.in - # click-repl + # via click-repl slumber==0.7.1 # via -r requirements/base.in sqlparse==0.4.2 @@ -100,7 +100,7 @@ stevedore==3.5.0 # via # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/base.in urllib3==1.26.8 # via requests diff --git a/requirements/celery50.txt b/requirements/celery50.txt index af27e60..82ae3a3 100644 --- a/requirements/celery50.txt +++ b/requirements/celery50.txt @@ -5,5 +5,5 @@ click==8.0.3 click-didyoumean==0.3.0 click-repl==0.2.0 kombu==5.2.3 -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 vine==5.0.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index 263b4ac..365bde3 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade # certifi==2021.10.8 # via requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.2 +coverage==6.3.1 # via codecov distlib==0.3.4 # via virtualenv @@ -22,13 +22,13 @@ idna==3.3 # via requests packaging==21.3 # via tox -platformdirs==2.4.1 +platformdirs==2.5.0 # via virtualenv pluggy==1.0.0 # via tox py==1.11.0 # via tox -pyparsing==3.0.6 +pyparsing==3.0.7 # via packaging requests==2.27.1 # via codecov @@ -46,5 +46,5 @@ tox-battery==0.6.1 # via -r requirements/ci.in urllib3==1.26.8 # via requests -virtualenv==20.13.0 +virtualenv==20.13.1 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index b1bb226..d6a134a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,7 +12,7 @@ -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # Stay on an LTS release -django<2.3 +django<4.0 # pinning celery to latest release celery<6.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index df63f71..ef0e828 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -8,6 +8,10 @@ amqp==5.0.9 # via # -r requirements/quality.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/quality.txt + # django astroid==2.9.3 # via # -r requirements/quality.txt @@ -33,7 +37,7 @@ certifi==2021.10.8 # requests chardet==4.0.0 # via diff-cover -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -66,13 +70,13 @@ click-repl==0.2.0 # via # -r requirements/quality.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[toml]==6.2 +coverage[toml]==6.3.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -86,7 +90,7 @@ distlib==0.3.4 # via # -r requirements/ci.txt # virtualenv -django==2.2.26 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -109,7 +113,7 @@ django-model-utils==4.2.0 # -r requirements/quality.txt # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via # -r requirements/quality.txt # edx-django-utils @@ -117,11 +121,11 @@ djangorestframework==3.13.1 # via # -r requirements/quality.txt # super-csv -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via # -r requirements/quality.txt # super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via # -r requirements/quality.txt # super-csv @@ -129,7 +133,7 @@ edx-i18n-tools==0.8.1 # via -r requirements/dev.in edx-lint==5.2.1 # via -r requirements/quality.txt -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/quality.txt filelock==3.4.2 # via @@ -180,7 +184,7 @@ mccabe==0.6.1 # pylint mock==4.0.3 # via -r requirements/quality.txt -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via # -r requirements/quality.txt # edx-django-utils @@ -192,7 +196,7 @@ packaging==21.3 # tox path==16.3.0 # via edx-i18n-tools -pbr==5.8.0 +pbr==5.8.1 # via # -r requirements/quality.txt # stevedore @@ -200,9 +204,9 @@ pep517==0.12.0 # via # -r requirements/pip-tools.txt # pip-tools -pip-tools==6.4.0 +pip-tools==6.5.1 # via -r requirements/pip-tools.txt -platformdirs==2.4.1 +platformdirs==2.5.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -217,7 +221,7 @@ pluggy==1.0.0 # tox polib==1.1.1 # via edx-i18n-tools -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via # -r requirements/quality.txt # click-repl @@ -257,16 +261,16 @@ pylint-plugin-utils==0.7 # -r requirements/quality.txt # pylint-celery # pylint-django -pymongo==4.0.1 +pymongo==3.12.3 # via # -r requirements/quality.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.7 # via # -r requirements/ci.txt # -r requirements/quality.txt # packaging -pytest==6.2.5 +pytest==7.0.0 # via # -r requirements/quality.txt # pytest-cov @@ -324,7 +328,7 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/quality.txt text-unidecode==1.3 # via @@ -335,14 +339,14 @@ toml==0.10.2 # -r requirements/ci.txt # -r requirements/quality.txt # pylint - # pytest # tox -tomli==2.0.0 +tomli==2.0.1 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt # coverage # pep517 + # pytest tox==3.24.5 # via # -r requirements/ci.txt @@ -365,7 +369,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.13.0 +virtualenv==20.13.1 # via # -r requirements/ci.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index 5786116..3987c00 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -10,6 +10,10 @@ amqp==5.0.9 # via # -r requirements/test.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/test.txt + # django attrs==21.4.0 # via # -r requirements/test.txt @@ -31,9 +35,7 @@ certifi==2021.10.8 # via # -r requirements/test.txt # requests -cffi==1.15.0 - # via cryptography -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via # -r requirements/test.txt # requests @@ -57,19 +59,17 @@ click-repl==0.2.0 # via # -r requirements/test.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via -r requirements/test.txt colorama==0.4.4 # via twine -coverage[toml]==6.2 +coverage[toml]==6.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==36.0.1 - # via secretstorage ddt==1.4.4 # via -r requirements/test.txt -django==2.2.26 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -91,7 +91,7 @@ django-model-utils==4.2.0 # -r requirements/test.txt # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via # -r requirements/test.txt # edx-django-utils @@ -107,15 +107,15 @@ docutils==0.17.1 # readme-renderer # restructuredtext-lint # sphinx -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via # -r requirements/test.txt # super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via # -r requirements/test.txt # super-csv -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/test.txt edx-sphinx-theme==3.0.0 # via -r requirements/doc.in @@ -129,18 +129,15 @@ idna==3.3 # requests imagesize==1.3.0 # via sphinx -importlib-metadata==4.10.0 +importlib-metadata==4.10.1 # via # keyring + # sphinx # twine iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -jeepney==0.7.1 - # via - # keyring - # secretstorage jinja2==3.0.3 # via # -r requirements/test.txt @@ -162,7 +159,7 @@ markupsafe==2.0.1 # jinja2 mock==4.0.3 # via -r requirements/test.txt -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via # -r requirements/test.txt # edx-django-utils @@ -172,7 +169,7 @@ packaging==21.3 # bleach # pytest # sphinx -pbr==5.8.0 +pbr==5.8.1 # via # -r requirements/test.txt # stevedore @@ -182,7 +179,7 @@ pluggy==1.0.0 # via # -r requirements/test.txt # pytest -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via # -r requirements/test.txt # click-repl @@ -194,22 +191,20 @@ py==1.11.0 # via # -r requirements/test.txt # pytest -pycparser==2.21 - # via cffi pygments==2.11.2 # via # doc8 # readme-renderer # sphinx -pymongo==4.0.1 +pymongo==3.12.3 # via # -r requirements/test.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.7 # via # -r requirements/test.txt # packaging -pytest==6.2.5 +pytest==7.0.0 # via # -r requirements/test.txt # pytest-cov @@ -248,10 +243,8 @@ requests-toolbelt==0.9.1 # via twine restructuredtext-lint==1.3.2 # via doc8 -rfc3986==1.5.0 +rfc3986==2.0.0 # via twine -secretstorage==3.3.1 - # via keyring simplejson==3.17.6 # via # -r requirements/test.txt @@ -266,7 +259,7 @@ slumber==0.7.1 # via -r requirements/test.txt snowballstemmer==2.2.0 # via sphinx -sphinx==4.3.2 +sphinx==4.4.0 # via # -r requirements/doc.in # edx-sphinx-theme @@ -293,28 +286,26 @@ stevedore==3.5.0 # doc8 # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/test.txt text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify -toml==0.10.2 - # via - # -r requirements/test.txt - # pytest -tomli==2.0.0 +tomli==2.0.1 # via # -r requirements/test.txt # coverage + # pytest tqdm==4.62.3 # via twine -twine==3.7.1 +twine==3.8.0 # via -r requirements/doc.in urllib3==1.26.8 # via # -r requirements/test.txt # requests + # twine vine==5.0.0 # via # -r requirements/test.txt diff --git a/requirements/pii_check.txt b/requirements/pii_check.txt index 09f31ec..3454c4d 100644 --- a/requirements/pii_check.txt +++ b/requirements/pii_check.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -8,6 +8,10 @@ amqp==5.0.9 # via # -r requirements/base.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/base.txt + # django billiard==3.6.4.0 # via # -r requirements/base.txt @@ -21,7 +25,7 @@ certifi==2021.10.8 # via # -r requirements/base.txt # requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via # -r requirements/base.txt # requests @@ -45,9 +49,9 @@ click-repl==0.2.0 # via # -r requirements/base.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via -r requirements/pii_check.in -django==2.2.26 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -69,7 +73,7 @@ django-model-utils==4.2.0 # -r requirements/base.txt # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via # -r requirements/base.txt # edx-django-utils @@ -77,15 +81,15 @@ djangorestframework==3.13.1 # via # -r requirements/base.txt # super-csv -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via # -r requirements/base.txt # super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via # -r requirements/base.txt # super-csv -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/base.txt future==0.18.2 # via @@ -107,15 +111,15 @@ kombu==5.2.3 # celery markupsafe==2.0.1 # via jinja2 -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via # -r requirements/base.txt # edx-django-utils -pbr==5.8.0 +pbr==5.8.1 # via # -r requirements/base.txt # stevedore -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via # -r requirements/base.txt # click-repl @@ -123,7 +127,7 @@ psutil==5.9.0 # via # -r requirements/base.txt # edx-django-utils -pymongo==4.0.1 +pymongo==3.12.3 # via # -r requirements/base.txt # edx-opaque-keys @@ -161,7 +165,7 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/base.txt text-unidecode==1.3 # via python-slugify diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index f4b4921..42f7d6a 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -8,9 +8,9 @@ click==8.0.3 # via pip-tools pep517==0.12.0 # via pip-tools -pip-tools==6.4.0 +pip-tools==6.5.1 # via -r requirements/pip-tools.in -tomli==2.0.0 +tomli==2.0.1 # via pep517 wheel==0.37.1 # via pip-tools diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7ecb8..4dd7cb5 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade diff --git a/requirements/quality.txt b/requirements/quality.txt index 53d330e..00bb1a7 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -8,6 +8,10 @@ amqp==5.0.9 # via # -r requirements/test.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/test.txt + # django astroid==2.9.3 # via # pylint @@ -29,7 +33,7 @@ certifi==2021.10.8 # via # -r requirements/test.txt # requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via # -r requirements/test.txt # requests @@ -57,17 +61,17 @@ click-repl==0.2.0 # via # -r requirements/test.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via # -r requirements/test.txt # edx-lint -coverage[toml]==6.2 +coverage[toml]==6.3.1 # via # -r requirements/test.txt # pytest-cov ddt==1.4.4 # via -r requirements/test.txt -django==2.2.26 +django==3.2.12 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -c requirements/constraints.txt @@ -89,7 +93,7 @@ django-model-utils==4.2.0 # -r requirements/test.txt # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via # -r requirements/test.txt # edx-django-utils @@ -97,17 +101,17 @@ djangorestframework==3.13.1 # via # -r requirements/test.txt # super-csv -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via # -r requirements/test.txt # super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via # -r requirements/test.txt # super-csv edx-lint==5.2.1 # via -r requirements/quality.in -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/test.txt future==0.18.2 # via @@ -147,7 +151,7 @@ mccabe==0.6.1 # via pylint mock==4.0.3 # via -r requirements/test.txt -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via # -r requirements/test.txt # edx-django-utils @@ -155,17 +159,17 @@ packaging==21.3 # via # -r requirements/test.txt # pytest -pbr==5.8.0 +pbr==5.8.1 # via # -r requirements/test.txt # stevedore -platformdirs==2.4.1 +platformdirs==2.5.0 # via pylint pluggy==1.0.0 # via # -r requirements/test.txt # pytest -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via # -r requirements/test.txt # click-repl @@ -195,15 +199,15 @@ pylint-plugin-utils==0.7 # via # pylint-celery # pylint-django -pymongo==4.0.1 +pymongo==3.12.3 # via # -r requirements/test.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.7 # via # -r requirements/test.txt # packaging -pytest==6.2.5 +pytest==7.0.0 # via # -r requirements/test.txt # pytest-cov @@ -253,21 +257,19 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/test.txt text-unidecode==1.3 # via # -r requirements/test.txt # python-slugify toml==0.10.2 - # via - # -r requirements/test.txt - # pylint - # pytest -tomli==2.0.0 + # via pylint +tomli==2.0.1 # via # -r requirements/test.txt # coverage + # pytest typing-extensions==4.0.1 # via # astroid diff --git a/requirements/test.txt b/requirements/test.txt index c0d4c72..6e0f9e5 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # make upgrade @@ -7,6 +7,10 @@ # via # -r requirements/base.txt # kombu +asgiref==3.5.0 + # via + # -r requirements/base.txt + # django attrs==21.4.0 # via pytest # via @@ -20,7 +24,7 @@ certifi==2021.10.8 # via # -r requirements/base.txt # requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.11 # via # -r requirements/base.txt # requests @@ -44,9 +48,9 @@ click-repl==0.2.0 # via # -r requirements/base.txt # celery -code-annotations==1.2.0 +code-annotations==1.3.0 # via -r requirements/test.in -coverage[toml]==6.2 +coverage[toml]==6.3.1 # via pytest-cov ddt==1.4.4 # via -r requirements/test.in @@ -71,7 +75,7 @@ django-model-utils==4.2.0 # -r requirements/base.txt # edx-celeryutils # super-csv -django-waffle==2.2.1 +django-waffle==2.3.0 # via # -r requirements/base.txt # edx-django-utils @@ -79,15 +83,15 @@ djangorestframework==3.13.1 # via # -r requirements/base.txt # super-csv -edx-celeryutils==1.1.1 +edx-celeryutils==1.2.1 # via # -r requirements/base.txt # super-csv -edx-django-utils==4.4.1 +edx-django-utils==4.5.0 # via # -r requirements/base.txt # super-csv -edx-opaque-keys==2.2.2 +edx-opaque-keys==2.3.0 # via -r requirements/base.txt future==0.18.2 # via @@ -112,19 +116,19 @@ markupsafe==2.0.1 # via jinja2 mock==4.0.3 # via -r requirements/test.in -newrelic==7.2.4.171 +newrelic==7.4.0.172 # via # -r requirements/base.txt # edx-django-utils packaging==21.3 # via pytest -pbr==5.8.0 +pbr==5.8.1 # via # -r requirements/base.txt # stevedore pluggy==1.0.0 # via pytest -prompt-toolkit==3.0.24 +prompt-toolkit==3.0.27 # via # -r requirements/base.txt # click-repl @@ -134,13 +138,13 @@ psutil==5.9.0 # edx-django-utils py==1.11.0 # via pytest -pymongo==4.0.1 +pymongo==3.12.3 # via # -r requirements/base.txt # edx-opaque-keys -pyparsing==3.0.6 +pyparsing==3.0.7 # via packaging -pytest==6.2.5 +pytest==7.0.0 # via # pytest-cov # pytest-django @@ -182,14 +186,14 @@ stevedore==3.5.0 # code-annotations # edx-django-utils # edx-opaque-keys -super-csv==2.1.2 +super-csv==2.1.4 # via -r requirements/base.txt text-unidecode==1.3 # via python-slugify -toml==0.10.2 - # via pytest -tomli==2.0.0 - # via coverage +tomli==2.0.1 + # via + # coverage + # pytest urllib3==1.26.8 # via # -r requirements/base.txt diff --git a/tox.ini b/tox.ini index 594b086..55c8e8a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,62 +1,60 @@ [tox] -envlist = py38-django{22,30,31,32}-celery{44,50} +envlist = py38-django{32,40}-celery{44,50} [testenv] setenv = - PYTHONPATH = {toxinidir}/mock_apps/ + PYTHONPATH = {toxinidir}/mock_apps/ deps = - -r{toxinidir}/requirements/test.txt - django22: Django>=2.2,<2.3 - django30: Django>=3.0,<3.1 - django31: Django>=3.1,<3.2 - django32: Django>=3.2,<4.0 - celery44: -r{toxinidir}/requirements/celery44.txt - celery50: -r{toxinidir}/requirements/celery50.txt + -r{toxinidir}/requirements/test.txt + django32: Django>=3.2,<4.0 + django40: Django>=4.0,<4.1 + celery44: -r{toxinidir}/requirements/celery44.txt + celery50: -r{toxinidir}/requirements/celery50.txt commands = - python -Wd -m pytest {posargs} + python -Wd -m pytest {posargs} [testenv:docs] setenv = - DJANGO_SETTINGS_MODULE = test_settings - PYTHONPATH = {toxinidir} + DJANGO_SETTINGS_MODULE = test_settings + PYTHONPATH = {toxinidir} whitelist_externals = - make - rm + make + rm deps = - -r{toxinidir}/requirements/doc.txt + -r{toxinidir}/requirements/doc.txt commands = - doc8 --ignore-path docs/_build README.rst docs - rm -f docs/bulk_grades.rst - rm -f docs/modules.rst - make -C docs clean - make -C docs html - python setup.py bdist_wheel - twine check dist/* + doc8 --ignore-path docs/_build README.rst docs + rm -f docs/bulk_grades.rst + rm -f docs/modules.rst + make -C docs clean + make -C docs html + python setup.py bdist_wheel + twine check dist/* [testenv:quality] setenv = - DJANGO_SETTINGS_MODULE = test_settings - PYTHONPATH = {toxinidir}/mock_apps/ + DJANGO_SETTINGS_MODULE = test_settings + PYTHONPATH = {toxinidir}/mock_apps/ whitelist_externals = - make - rm - touch + make + rm + touch deps = - -r{toxinidir}/requirements/quality.txt + -r{toxinidir}/requirements/quality.txt commands = - touch tests/__init__.py - pylint bulk_grades manage.py setup.py - rm tests/__init__.py - pycodestyle bulk_grades manage.py setup.py - isort --check-only --diff tests test_utils bulk_grades manage.py setup.py test_settings.py - make selfcheck + touch tests/__init__.py + pylint bulk_grades manage.py setup.py + rm tests/__init__.py + pycodestyle bulk_grades manage.py setup.py + isort --check-only --diff tests test_utils bulk_grades manage.py setup.py test_settings.py + make selfcheck [testenv:pii_check] setenv = - DJANGO_SETTINGS_MODULE = test_settings - PYTHONPATH = {toxinidir}/mock_apps/ + DJANGO_SETTINGS_MODULE = test_settings + PYTHONPATH = {toxinidir}/mock_apps/ deps = - -r{toxinidir}/requirements/pii_check.txt + -r{toxinidir}/requirements/pii_check.txt commands = - code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage + code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage