diff --git a/.travis.yml b/.travis.yml index 9580a23..f901aa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,29 +2,27 @@ language: python cache: pip sudo: false -python: +python: - "2.7" - "3.4" - "3.5" - "3.6" env: - - DJANGO=1.8 - - DJANGO=1.9 - - DJANGO=1.10 - DJANGO=1.11 - DJANGO=2.0 - DJANGO=2.1 + - DJANGO=2.2 matrix: fast_finish: true exclude: - { python: "2.7", env: DJANGO=2.0 } - { python: "2.7", env: DJANGO=2.1 } + - { python: "2.7", env: DJANGO=2.2 } + - { python: "3.4", env: DJANGO=2.1 } - - { python: "3.6", env: DJANGO=1.8 } - - { python: "3.6", env: DJANGO=1.9 } - - { python: "3.6", env: DJANGO=1.10 } + - { python: "3.4", env: DJANGO=2.2 } install: - pip install coverage coveralls tox tox-travis diff --git a/runtests.py b/runtests.py index e884196..2fca4f5 100644 --- a/runtests.py +++ b/runtests.py @@ -8,6 +8,8 @@ def get_suite(): disc_folder = path.abspath(path.dirname(__file__)) + settings.configure(SECRET_KEY='dummy') + stdout.write("Discovering tests in '%s'..." % disc_folder) suite = unittest.TestSuite() loader = unittest.loader.defaultTestLoader @@ -17,10 +19,6 @@ def get_suite(): def run_tests(): - settings.configure( - SECRET_KEY='dummy', - ) - suite = get_suite() stdout.write("Running tests...\n") runner = unittest.TextTestRunner() diff --git a/setup.py b/setup.py index 408a015..16e2d1a 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ license="MIT", description="Sanity for the django choices functionality.", long_description=readme, - install_requires=['Django>=1.8'], + install_requires=['Django>=1.11'], test_suite='runtests.get_suite', url="https://github.com/bigjason/django-choices", author="Jason Webb", diff --git a/tox.ini b/tox.ini index ca8ae0d..c2c7a6d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,30 +1,25 @@ [tox] envlist = - py33-django18, - py{27,34,35,py}-django{18,19,110,111}, - py34-django20, - py{35,36,37}-django{20,21} + py{27,34,35,36,37,py}-django111, + py{34,35,36,37}-django20, + py{35,36,37}-django{21,22}, docs, isort skip_missing_interpreters = true [travis:env] -DJANGO = - 1.8: django18 - 1.9: django19 - 1.10: django110 +DJANGO = 1.11: django111 2.0: django20 2.1: django21 + 2.2: django22 [testenv] deps= - django18: Django>=1.8,<1.9 - django19: Django>=1.9,<1.10 - django110: Django>=1.10,<1.11 django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 + django22: Django>=2.2,<3.0 coverage coveralls commands=coverage run --rcfile={toxinidir}/.coveragerc {toxinidir}/setup.py test