diff options
author | Hugo Smett <hsmett@hybird.org> | 2017-08-25 16:33:41 +0200 |
---|---|---|
committer | Hugo Smett <hsmett@hybird.org> | 2017-09-11 13:55:28 +0200 |
commit | 1c2d746dad1131301545e14e05db639599ed78af (patch) | |
tree | 1d8ab9346b35ccbccf102ada07efe96641545a3e | |
parent | 5d835b39f1400e8e878b6bfd675d9ee0fe59de42 (diff) | |
download | django-appconf-1c2d746dad1131301545e14e05db639599ed78af.tar.gz |
Follow django Python support map, add test for stable django 1.10 and 1.11
-rw-r--r-- | .travis.yml | 89 | ||||
-rw-r--r-- | docs/changelog.rst | 8 | ||||
-rw-r--r-- | setup.py | 8 | ||||
-rw-r--r-- | tox.ini | 17 |
4 files changed, 90 insertions, 32 deletions
diff --git a/.travis.yml b/.travis.yml index 7f9bd98..190f875 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,79 @@ sudo: false language: python -python: - - 3.5 -env: - - TOXENV=flake8-py27 - - TOXENV=flake8-py34 - - TOXENV=py27-dj18 - - TOXENV=py27-dj19 - - TOXENV=py27-dj110 - - TOXENV=py32-dj18 - - TOXENV=py33-dj18 - - TOXENV=py34-dj18 - - TOXENV=py34-dj19 - - TOXENV=py34-dj110 - - TOXENV=py35-dj19 - - TOXENV=py35-dj110 + matrix: fast_finish: true allow_failures: - - env: TOXENV=py27-dj110 - - env: TOXENV=py34-dj110 - - env: TOXENV=py35-dj110 + - env: TOXENV=py34-djmaster + - env: TOXENV=py35-djmaster + - env: TOXENV=py36-djmaster + include: + # Python version is just for the look on travis. + - python: 2.7 + env: TOXENV=flake8-py27 + + - python: 3.4 + env: TOXENV=flake8-py34 + + - python: 2.7 + env: TOXENV=py27-dj18 + + - python: 2.7 + env: TOXENV=py27-dj19 + + - python: 2.7 + env: TOXENV=py27-dj110 + + - python: 2.7 + env: TOXENV=py27-dj111 + + - python: 3.3 + env: TOXENV=py33-dj18 + + - python: 3.4 + env: TOXENV=py34-dj18 + + - python: 3.4 + env: TOXENV=py34-dj19 + + - python: 3.4 + env: TOXENV=py34-dj110 + + - python: 3.4 + env: TOXENV=py34-dj111 + + - python: 3.4 + env: TOXENV=py34-djmaster + + - python: 3.5 + env: TOXENV=py35-dj18 + + - python: 3.5 + env: TOXENV=py35-dj19 + + - python: 3.5 + env: TOXENV=py35-dj110 + + - python: 3.5 + env: TOXENV=py35-dj111 + + - python: 3.5 + env: TOXENV=py35-djmaster + + - python: 3.6 + env: TOXENV=py36-dj111 + + - python: 3.6 + env: TOXENV=py36-djmaster + install: - # Virtualenv < 14 is required to keep the Python 3.2 builds running. - - pip install tox "virtualenv<14" + - pip install tox codecov script: - - tox + - tox -e $TOXENV + notifications: irc: "irc.freenode.org#django-compressor" + after_success: - - pip install codecov - codecov diff --git a/docs/changelog.rst b/docs/changelog.rst index a4054ce..e2314a8 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,14 @@ Changelog ========= +Unreleased +------------------ + +* Update tox configuration to match Django Python support map + +* Confirm support for Django 1.10 and Django 1.11 + + 1.0.2 (2016-04-19) ------------------ @@ -34,17 +34,21 @@ setup( 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', + 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', + 'Framework :: Django :: 1.10', + 'Framework :: Django :: 1.11', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Utilities', ], ) @@ -5,30 +5,31 @@ minversion = 1.8 envlist = flake8-py27, flake8-py34, - py{27,32,33,34}-dj18, - py{27,34,35}-dj19, - py{27,34,35}-dj110 + py{27,33,34,35}-dj18, + py{27,34,35}-{dj19,dj110}, + py{27,34,35,36}-dj111, + py{34,35,36}-djmaster [testenv] basepython = py27: python2.7 - py32: python3.2 py33: python3.3 py34: python3.4 py35: python3.5 + py36: python3.6 pypy: pypy usedevelop = true setenv = PYTHONPATH = {toxinidir} DJANGO_SETTINGS_MODULE=tests.test_settings deps = - flake8 - py{27,33,34,35,pypy}: coverage - py32: coverage==3.7.1 # latest coverage support py3.2 + py{27,33,34,35,36,pypy}: coverage django-discover-runner dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django - dj110: https://github.com/django/django/archive/master.tar.gz#egg=django + dj110: https://github.com/django/django/archive/stable/1.10.x.tar.gz#egg=django + dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django + djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django commands = coverage run {envbindir}/django-admin.py test -v2 {posargs:tests} |