Merge pull request #36 from edx/jawayria/django32_support

feat: Added support for Django32

.github/workflows/pull-request.yml

@@ -16,6 +16,7 @@ jobs:
         - django22
         - django30
         - django31
+        - django32
     steps:
     - uses: actions/checkout@v2
     - name: setup python

.gitignore

@@ -8,3 +8,4 @@ package-lock.json
 .tox/
 sdk/
 venv/
+.idea/

setup.py

@@ -48,7 +48,7 @@ def is_requirement(line):
 
 setup(
     name='xblock-sql-grader',
-    version='0.2',
+    version='0.3.0',
     description='SQL Grader XBlock',  # TODO: write a better description.
     license='AGPLv3',
     packages=find_packages(exclude=('sql_grader.tests')),
@@ -71,6 +71,9 @@ def is_requirement(line):
         'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',

sql_grader/mixins/scenario.py

@@ -62,7 +62,7 @@ def workbench_scenarios(cls):
         Gather scenarios to be displayed in the workbench
         """
         module = cls.__module__
-        module = module.split('.')[0]
+        module = module.split('.', maxsplit=1)[0]
         directory = pkg_resources.resource_filename(module, 'scenarios')
         files = _find_files(directory)
         scenarios = _read_files(files)

sql_grader/settings.py

@@ -15,3 +15,4 @@
     'sql_grader/translations',
 ]
 SECRET_KEY = 'SECRET_KEY'
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

tox.ini

@@ -1,95 +1,97 @@
 [tox]
 envlist = 
-	csslint
-	eslint
-	py38-django{22,30,31}quality
+    csslint
+    eslint
+    py38-django{22,30,31,32}
+    quality
 
 [testenv]
 deps = 
-	-rrequirements/test.txt
-	-e git+https://github.com/edx/[email protected]#egg=codejail
-	django22: Django>=2.2,<2.3
-	django30: Django>=3.0,<3.1
-	django31: Django>=3.1,<3.2
-
+    -rrequirements/test.txt
+    -e git+https://github.com/edx/[email protected]#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
+
 commands = 
-	coverage run manage.py test
-	coverage report
-	coverage html
+    coverage run manage.py test
+    coverage report
+    coverage html
 
 [testenv:clean]
 commands = 
-	coverage erase
+    coverage erase
 skip_install = True
 
 [testenv:csslint]
 whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands = 
-	{toxinidir}/node_modules/csslint/dist/cli.js sql_grader/static/
+    {toxinidir}/node_modules/csslint/dist/cli.js sql_grader/static/
 deps = 
 skip_install = True
 
 [testenv:eslint]
 whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 commands = 
-	{toxinidir}/node_modules/eslint/bin/eslint.js sql_grader/static/view.js
+    {toxinidir}/node_modules/eslint/bin/eslint.js sql_grader/static/view.js
 deps = 
 skip_install = True
 
 [testenv:quality]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps = 
-	-rrequirements/quality.txt
+    -rrequirements/quality.txt
 commands = 
-	pycodestyle sql_grader/
-	pylint sql_grader/
+    pycodestyle sql_grader/
+    pylint sql_grader/
 
 [testenv:translations_push]
 deps = 
-	transifex-client
+    transifex-client
 commands = 
-	tx push -s
+    tx push -s
 
 [testenv:translations_pull]
 deps = 
-	edx-i18n-tools==0.4.8
-	transifex-client
+    edx-i18n-tools==0.4.8
+    transifex-client
 commands = 
-	cd sql_grader && i18n_tool transifex pull
+    cd sql_grader && i18n_tool transifex pull
 whitelist_externals = 
-	cd
+    cd
 
 [testenv:translations_compile]
 deps = 
-	edx-i18n-tools==0.4.8
+    edx-i18n-tools==0.4.8
 commands = 
-	cd sql_grader && i18n_tool generate
+    cd sql_grader && i18n_tool generate
 whitelist_externals = 
-	cd
+    cd
 
 [testenv:translations_dummy]
 deps = 
-	edx-i18n-tools==0.4.8
+    edx-i18n-tools==0.4.8
 commands = 
-	cd sql_grader && i18n_tool dummy
+    cd sql_grader && i18n_tool dummy
 whitelist_externals = 
-	cd
+    cd
 
 [testenv:translations_detect_changed]
 deps = 
-	edx-i18n-tools==0.4.8
+    edx-i18n-tools==0.4.8
 commands = 
-	cd sql_grader && i18n_tool changed
+    cd sql_grader && i18n_tool changed
 whitelist_externals = 
-	cd
+    cd
 
 [testenv:translations_extract]
 deps = 
-	edx-i18n-tools==0.4.8
+    edx-i18n-tools==0.4.8
 commands = 
-	cd sql_grader && i18n_tool extract
+    cd sql_grader && i18n_tool extract
 whitelist_externals = 
-	cd
+    cd