From 927ff2e12e0615e701fd641671ed9bfc2360f057 Mon Sep 17 00:00:00 2001
From: Salman Nawaz <salman.nawaz@A006-01081.local>
Date: Thu, 27 Jul 2023 17:52:58 +0500
Subject: [PATCH] fix: add django 4.2 support

---
 .github/workflows/ci.yml     | 4 +---
 setup.py                     | 6 ++----
 sql_grader/mixins/grading.py | 2 +-
 tox.ini                      | 8 ++------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5cc21ae..78be3e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,10 +19,8 @@ jobs:
         - csslint
         - eslint
         - quality
-        - django22
-        - django30
-        - django31
         - django32
+        - django42
     steps:
     - uses: actions/checkout@v2
     - name: setup python
diff --git a/setup.py b/setup.py
index a54681c..a1958a1 100644
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ def is_requirement(line):
 
 setup(
     name='xblock-sql-grader',
-    version='0.3.1',
+    version='0.4.0',
     description='SQL Grader XBlock',  # TODO: write a better description.
     license='AGPLv3',
     long_description=README,
@@ -120,10 +120,8 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
diff --git a/sql_grader/mixins/grading.py b/sql_grader/mixins/grading.py
index 5fb855f..e846d0e 100644
--- a/sql_grader/mixins/grading.py
+++ b/sql_grader/mixins/grading.py
@@ -10,7 +10,7 @@
 # despite it also being a third-party package.
 from codejail.safe_exec import safe_exec
 from codejail.safe_exec import SafeExecException
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from xblock.fields import Boolean
 from xblock.fields import Float
 from xblock.fields import Integer
diff --git a/tox.ini b/tox.ini
index 7749b1f..10f7578 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,18 +2,14 @@
 envlist = 
     csslint
     eslint
-    py38-django{22,30,31,32}
-    quality
+    py38-django{32,42}quality
 
 [testenv]
 deps = 
     -rrequirements/test.txt
     -e git+https://github.com/openedx/codejail.git@3.0.0#egg=codejail
-    django22: Django>=2.2,<2.3
-    django30: Django>=3.0,<3.1
-    django31: Django>=3.1,<3.2
     django32: Django>=3.2,<4.0
-    
+    django42: Django>=4.2,<4.3
 commands = 
     coverage run manage.py test
     coverage report