Skip to content

Commit

Permalink
Merge pull request #20 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 8dc95ec + 5ba4552 commit 7be99f8
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ package-lock.json
.tox/
sdk/
venv/
.idea/
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:
- TOX_ENV=django22
- TOX_ENV=django30
- TOX_ENV=django31
- TOX_ENV=django32
before_install:
- export BOTO_CONFIG=/dev/null
- pip install pip==20.0.2
Expand Down
2 changes: 1 addition & 1 deletion qualtricssurvey/mixins/scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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)
Expand Down
1 change: 1 addition & 0 deletions qualtricssurvey/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
'qualtricssurvey/translations',
]
SECRET_KEY = 'SECRET_KEY'
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
5 changes: 4 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.1.0'
version = '1.2.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 @@ -75,6 +75,9 @@ def is_requirement(line):
'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
39 changes: 20 additions & 19 deletions tox.ini
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 qualtricssurvey/public/
make requirements_js
{toxinidir}/node_modules/csslint/dist/cli.js qualtricssurvey/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 qualtricssurvey/public/view.js
make requirements_js
{toxinidir}/node_modules/eslint/bin/eslint.js --fix qualtricssurvey/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 qualtricssurvey/
pylint qualtricssurvey/
pycodestyle qualtricssurvey/
pylint qualtricssurvey/

[testenv:transifex]
deps =
transifex-client
transifex-client
commands =
tx push -s
tx push -s

0 comments on commit 7be99f8

Please sign in to comment.