diff --git a/.gitignore b/.gitignore index 7bbf64c..5113e47 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ package-lock.json .tox/ sdk/ venv/ +.idea/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 9013a92..34915d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/qualtricssurvey/mixins/scenario.py b/qualtricssurvey/mixins/scenario.py index 58d3d8b..6b59895 100644 --- a/qualtricssurvey/mixins/scenario.py +++ b/qualtricssurvey/mixins/scenario.py @@ -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) diff --git a/qualtricssurvey/settings.py b/qualtricssurvey/settings.py index db8b583..551f403 100644 --- a/qualtricssurvey/settings.py +++ b/qualtricssurvey/settings.py @@ -13,3 +13,4 @@ 'qualtricssurvey/translations', ] SECRET_KEY = 'SECRET_KEY' +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/setup.py b/setup.py index 9e62bfe..aab0441 100755 --- a/setup.py +++ b/setup.py @@ -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: @@ -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', ], diff --git a/tox.ini b/tox.ini index 127b31c..cfcc280 100644 --- a/tox.ini +++ b/tox.ini @@ -1,30 +1,31 @@ [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 @@ -32,22 +33,22 @@ skip_install = True 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