forked from Stanford-Online/xblock-image-modal
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from edx/jawayria/django32_support
feat: Added support for Django3.2
- Loading branch information
Showing
5 changed files
with
29 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,4 @@ | |
'imagemodal/translations', | ||
] | ||
SECRET_KEY = 'SECRET_KEY' | ||
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,53 +1,54 @@ | ||
[tox] | ||
envlist = csslint,eslint,py38-django{22,30,31},quality | ||
envlist = csslint,eslint,py38-django{22,30,31,32},quality | ||
|
||
[testenv] | ||
deps = | ||
django22: Django>=2.2,<2.3 | ||
django30: Django>=3.0,<3.1 | ||
django31: Django>=3.1,<3.2 | ||
-rrequirements/test.txt | ||
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 | ||
coverage report | ||
coverage html | ||
coverage run manage.py test | ||
coverage report | ||
coverage html | ||
|
||
[testenv:clean] | ||
commands = | ||
coverage erase | ||
coverage erase | ||
deps = | ||
-rrequirements/test.txt | ||
-rrequirements/test.txt | ||
skip_install = True | ||
|
||
[testenv:csslint] | ||
whitelist_externals = {toxinidir}/node_modules/csslint/dist/cli.js | ||
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH | ||
commands = | ||
make requirements_js | ||
{toxinidir}/node_modules/csslint/dist/cli.js imagemodal/public/ | ||
make requirements_js | ||
{toxinidir}/node_modules/csslint/dist/cli.js imagemodal/public/ | ||
deps = | ||
skip_install = True | ||
|
||
[testenv:eslint] | ||
whitelist_externals = {toxinidir}/node_modules/eslint/bin/eslint.js | ||
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH | ||
commands = | ||
make requirements_js | ||
{toxinidir}/node_modules/eslint/bin/eslint.js --fix imagemodal/public/view.js | ||
make requirements_js | ||
{toxinidir}/node_modules/eslint/bin/eslint.js --fix imagemodal/public/view.js | ||
deps = | ||
skip_install = True | ||
|
||
[testenv:quality] | ||
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH | ||
deps = | ||
-rrequirements/quality.txt | ||
-rrequirements/quality.txt | ||
commands = | ||
pycodestyle imagemodal/ | ||
pylint imagemodal/ | ||
pycodestyle imagemodal/ | ||
pylint imagemodal/ | ||
|
||
[testenv:transifex] | ||
deps = | ||
transifex-client | ||
transifex-client | ||
commands = | ||
tx push -s | ||
tx push -s | ||
|