From 1c6718a31299e6bdc7ae33dcb74feeef688308d4 Mon Sep 17 00:00:00 2001
From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com>
Date: Fri, 28 Jan 2022 16:35:33 +0500
Subject: [PATCH] chore: Post Django32 Cleanup (#1021)

---
 .github/workflows/ci.yml   | 20 ++++----------------
 CHANGELOG.rst              |  5 +++++
 edx_proctoring/__init__.py |  2 +-
 package.json               |  2 +-
 setup.py                   |  4 +---
 tox.ini                    |  8 ++++----
 6 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index caba1459509..cdae727527b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,23 +14,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os:
-          - ubuntu-20.04
-        python-version:
-          - 3.8
-        node-version:
-          - 10
+        os: ['ubuntu-20.04']
+        python-version: ['3.8']
+        node-version: ['10']
         toxenv:
-          - django30-drflatest
-          - django31-drflatest
-          - django32-drflatest
-          - quality
-          - pii_check
-          - version_check
-          - translations
-          - js_tests
-          - js_lint
-          - rst_validation
+        ['django32-drflatest', 'django40-drflatest', 'quality', 'pii_check', 'version_check', 'translations', 'js_tests', 'js_lint', 'rst_validation']
     steps:
     - uses: actions/checkout@v1
     - name: Setup python
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 88ae43d1d4d..0afa616bd7a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+[4.9.0] - 2022-01-25
+~~~~~~~~~~~~~~~~~~~~
+* Dropped Django22, 30 and 31
+* Added Support for Django40
+
 [4.8.4] - 2022-01-12
 ~~~~~~~~~~~~~~~~~~~~
 * Return better http status when review callback resulted in the original
diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py
index 681845f1380..166b6ac2eda 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__ = '4.8.4'
+__version__ = '4.9.0'
 
 default_app_config = 'edx_proctoring.apps.EdxProctoringConfig'  # pylint: disable=invalid-name
diff --git a/package.json b/package.json
index ff810fa2576..c64c02ef5b8 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": "4.8.4",
+  "version": "4.9.0",
   "main": "edx_proctoring/static/index.js",
   "scripts": {
     "test": "gulp test"
diff --git a/setup.py b/setup.py
index 9a11eb626dc..8b22d6259cd 100755
--- a/setup.py
+++ b/setup.py
@@ -71,10 +71,8 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 6d4de7e7875..1e03a84b7b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-        py38-celery{50}-django{30,31,32}-drflatest
+        py38-celery{50}-django{32, 40}-drflatest
         quality,
         version_check,
         pii_check,
@@ -8,8 +8,8 @@ envlist =
 
 [testenv]
 deps =
-    django30: Django>=3.0,<3.1
-    django31: Django>=3.1,<3.2
+    django32: Django>=3.2,<3.3
+    django40: Django>=4.0,<4.1
     drflatest: djangorestframework
     celery50: -r{toxinidir}/requirements/celery50.txt
     -rrequirements/test.txt
@@ -56,7 +56,7 @@ deps =
 commands =
     pylint edx_proctoring
     pycodestyle edx_proctoring
-    isort --check-only --recursive --diff edx_proctoring manage.py setup.py
+    isort --check-only --diff edx_proctoring manage.py setup.py
 
 [testenv:version_check]
 deps =