Skip to content

Commit

Permalink
Merge pull request #22 from edx/jawayria/django32_support
Browse files Browse the repository at this point in the history
feat: Added support for Django 3.2
  • Loading branch information
Jawayria authored Sep 30, 2021
2 parents 238c2ec + 1206958 commit fe44175
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
- TOXENV=django22
- TOXENV=django30
- TOXENV=django31
- TOXENV=django32
before_install:
- pip install -U pip
- export BOTO_CONFIG=/dev/null
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ Version 0.4
Version 0.5

Added grading to the xblock
Version 1.1.0

Added support for django 3.2
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from setuptools import setup


version = '1.0.0'
version = '1.1.0'
description = __doc__.strip().split('\n')[0]
this_directory = path.abspath(path.dirname(__file__))
with open(path.join(this_directory, 'README.rst')) as file_in:
Expand Down Expand Up @@ -76,6 +76,10 @@ def is_requirement(line):
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.8',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Topic :: Education',
'Topic :: Internet :: WWW/HTTP',
],
Expand Down
2 changes: 2 additions & 0 deletions submit_and_compare/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
'submit_and_compare/translations',
]
SECRET_KEY = 'submit_and_compare_SECRET_KEY'

DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[tox]
envlist = csslint,eslint,pycodestyle,pylint,py38-django{22,30,31}
envlist = csslint,eslint,pycodestyle,pylint,py38-django{22,30,31,32}

[testenv]
deps =
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0
-rrequirements/test.txt
commands =
coverage run manage.py test
Expand Down

0 comments on commit fe44175

Please sign in to comment.