From cff4462b684b3220685a63eeeafab14a1b634837 Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" Date: Mon, 19 Jul 2021 18:30:13 +0500 Subject: [PATCH] BOM-2683: Added Support for Django 3.2 (#907) * feat: Added Support for Django 3.2 * fix: version mismatch * chore: update changelog --- .github/workflows/ci.yml | 3 +++ CHANGELOG.rst | 4 ++++ edx_proctoring/__init__.py | 2 +- package.json | 2 +- setup.py | 4 +++- tox.ini | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37bd2c98249..ee5213bfb73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,9 @@ jobs: toxenv: - django22-drf310 - django22-drflatest + - django30-drflatest + - django31-drflatest + - django32-drflatest - quality - pii_check - version_check diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 234e9d1da10..71df2fbc0e2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,10 @@ Change Log Unreleased ~~~~~~~~~~ +[3.20.0] - 2021-07-19 +~~~~~~~~~~~~~~~~~~~~~ +* Added Django 3.0, 3.1 & 3.2 Support + [3.19.0] - 2021-07-16 ~~~~~~~~~~~~~~~~~~~~~ * Updated allowance modal to allow bulk allowances to be added. diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py index 9856164995c..9afe424ede7 100644 --- a/edx_proctoring/__init__.py +++ b/edx_proctoring/__init__.py @@ -3,6 +3,6 @@ """ # Be sure to update the version number in edx_proctoring/package.json -__version__ = '3.19.0' +__version__ = '3.20.0' default_app_config = 'edx_proctoring.apps.EdxProctoringConfig' # pylint: disable=invalid-name diff --git a/package.json b/package.json index 13a43e08aa8..751cb656892 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@edx/edx-proctoring", "//": "Note that the version format is slightly different than that of the Python version when using prereleases.", - "version": "3.19.0", + "version": "3.20.0", "main": "edx_proctoring/static/index.js", "scripts": { "test": "gulp test" diff --git a/setup.py b/setup.py index a6cba44a2fa..9a11eb626dc 100755 --- a/setup.py +++ b/setup.py @@ -72,10 +72,12 @@ def is_requirement(line): 'Development Status :: 4 - Beta', 'Framework :: Django', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', + 'Framework :: Django :: 3.1', + 'Framework :: Django :: 3.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Natural Language :: English', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.8', ], packages=[ diff --git a/tox.ini b/tox.ini index fb93901c376..f46cd33238b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py38-celery{50}-django{22,30}-drf{310,latest} + py38-celery{50}-django{22,30,31,32}-drf{310,latest} docs, quality, version_check,