diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2015-12-04 20:17:08 +0200 |
|---|---|---|
| committer | Ville Skyttä <ville.skytta@iki.fi> | 2015-12-04 20:21:28 +0200 |
| commit | 1a0a4644fb7b32ec0c7329abfe053fe3df288db3 (patch) | |
| tree | 350aa0ce8f092d32c4acb5d8ba994374f8e80499 | |
| parent | 41288c98e115673e814b3420b7755e9fc1187c3f (diff) | |
| download | django-appconf-1a0a4644fb7b32ec0c7329abfe053fe3df288db3.tar.gz | |
Update Django 1.9 and master test configs
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | tox.ini | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index c27e940..1a8c7b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ env: - TOXENV=py27-dj17 - TOXENV=py27-dj18 - TOXENV=py27-dj19 + - TOXENV=py27-dj110 - TOXENV=py32-dj17 - TOXENV=py32-dj18 - TOXENV=py33-dj17 @@ -15,13 +16,16 @@ env: - TOXENV=py34-dj17 - TOXENV=py34-dj18 - TOXENV=py34-dj19 + - TOXENV=py34-dj110 - TOXENV=py35-dj19 + - TOXENV=py35-dj110 matrix: fast_finish: true allow_failures: - - env: TOXENV=py27-dj19 - - env: TOXENV=py34-dj19 - env: TOXENV=py35-dj19 + - env: TOXENV=py27-dj110 + - env: TOXENV=py34-dj110 + - env: TOXENV=py35-dj110 install: - pip install tox script: @@ -7,7 +7,8 @@ envlist = flake8-py33, py{26,27}-dj14, py{27,32,33,34}-dj{17,18}, - py{27,34,35}-dj19 + py{27,34,35}-dj19, + py{27,34,35}-dj110 [testenv] basepython = @@ -33,7 +34,8 @@ deps = dj16: https://github.com/django/django/archive/stable/1.6.x.zip#egg=django dj17: https://github.com/django/django/archive/stable/1.7.x.zip#egg=django dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django - dj19: https://github.com/django/django/archive/master.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 commands = coverage run {envbindir}/django-admin.py test -v2 {posargs:tests} |