diff --git a/.travis.yml b/.travis.yml index d5f773b..b5966c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,24 @@ env: matrix: - TOX_ENV=py27-dj1.6.x - TOX_ENV=py27-dj1.7.x + - TOX_ENV=py27-dj1.8.x + - TOX_ENV=py27-dj1.9.x - TOX_ENV=py33-dj1.6.x - - TOX_ENV=py34-dj1.6.x - TOX_ENV=py33-dj1.7.x + - TOX_ENV=py33-dj1.8.x + - TOX_ENV=py33-dj1.9.x + - TOX_ENV=py34-dj1.6.x - TOX_ENV=py34-dj1.7.x + - TOX_ENV=py34-dj1.8.x + - TOX_ENV=py34-dj1.9.x - TOX_ENV=pypy-dj1.6.x + - TOX_ENV=pypy-dj1.7.x + - TOX_ENV=pypy-dj1.8.x + - TOX_ENV=pypy-dj1.9.x - TOX_ENV=pypy3-dj1.6.x + - TOX_ENV=pypy3-dj1.7.x + - TOX_ENV=pypy3-dj1.8.x + - TOX_ENV=pypy3-dj1.9.x install: - pip install tox script: @@ -21,3 +33,15 @@ script: # - coverage report # - pip install --quiet python-coveralls # - coveralls +matrix: + allow_failures: + - env: TOX_ENV=py27-dj1.8.x + - env: TOX_ENV=py27-dj1.9.x + - env: TOX_ENV=py33-dj1.8.x + - env: TOX_ENV=py33-dj1.9.x + - env: TOX_ENV=py34-dj1.8.x + - env: TOX_ENV=py34-dj1.9.x + - env: TOX_ENV=pypy-dj1.8.x + - env: TOX_ENV=pypy-dj1.9.x + - env: TOX_ENV=pypy3-dj1.8.x + - env: TOX_ENV=pypy3-dj1.9.x diff --git a/tox.ini b/tox.ini index 3cae8cf..57771d5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,12 @@ [tox] -# for py 3.x we are using only django 1.6.x as 1.5.x had only "experimental py3 support" -envlist = py27-dj1.6.x, py27-dj1.7.x, py33-dj1.6.x, py34-dj1.6.x, - py33-dj1.7.x, py34-dj1.7.x, pypy-dj1.6.x, pypy3-dj1.6.x, - py27-dj1.8.x, py33-dj1.8.x, py34-dj1.8.x, +envlist = py27-dj1.6.x, py33-dj1.6.x, py34-dj1.6.x, pypy-dj1.6.x, + pypy3-dj1.6.x, + py27-dj1.7.x, py33-dj1.7.x, py34-dj1.7.x, pypy-dj1.7.x, + pypy3-dj1.7.x, + py27-dj1.8.x, py33-dj1.8.x, py34-dj1.8.x, pypy-dj1.8.x, + pypy3-dj1.8.x, + py27-dj1.9.x, py33-dj1.9.x, py34-dj1.9.x, pypy-dj1.9.x, + pypy3-dj1.9.x, skipsdist = True [testenv] @@ -22,7 +26,7 @@ deps = [testenv:py27-dj1.7.x] basepython=python2.7 deps = - Django>=1.7,<1.7.999 + Django>=1.7,<1.8 {[testenv]deps} [testenv:py33-dj1.6.x] @@ -40,13 +44,13 @@ deps = [testenv:py33-dj1.7.x] basepython=python3.3 deps = - Django>=1.7,<1.7.999 + Django>=1.7,<1.8 {[testenv]deps} [testenv:py34-dj1.7.x] basepython=python3.4 deps = - Django>=1.7,<1.7.999 + Django>=1.7,<1.8 {[testenv]deps} [testenv:pypy-dj1.6.x] @@ -61,20 +65,74 @@ deps = Django>=1.6,<1.7 {[testenv]deps} +[testenv:pypy-dj1.7.x] +basepython=pypy +deps = + Django>=1.7,<1.8 + {[testenv]deps} + +[testenv:pypy3-dj1.7.x] +basepython=pypy3 +deps = + Django>=1.7,<1.8 + {[testenv]deps} + [testenv:py27-dj1.8.x] basepython=python2.7 deps = - Django>=1.8.c1,<1.9 + Django>=1.8,<1.9 {[testenv]deps} [testenv:py34-dj1.8.x] basepython=python3.4 deps = - Django>=1.8c1,<1.9 + Django>=1.8,<1.9 {[testenv]deps} [testenv:py33-dj1.8.x] basepython=python2.7 deps = - Django>=1.8.c1,<1.9 + Django>=1.8,<1.9 + {[testenv]deps} + +[testenv:pypy-dj1.8.x] +basepython=pypy +deps = + Django>=1.8,<1.9 + {[testenv]deps} + +[testenv:pypy3-dj1.8.x] +basepython=pypy3 +deps = + Django>=1.8,<1.9 + {[testenv]deps} + +[testenv:py27-dj1.9.x] +basepython=python2.7 +deps = + Django>=1.9,<1.9.999 + {[testenv]deps} + +[testenv:py34-dj1.9.x] +basepython=python3.4 +deps = + Django>=1.9,<1.9.999 + {[testenv]deps} + +[testenv:py33-dj1.9.x] +basepython=python2.7 +deps = + Django>=1.9,<1.9.999 + {[testenv]deps} + +[testenv:pypy-dj1.9.x] +basepython=pypy +deps = + Django>=1.9,<1.9.999 + {[testenv]deps} + +[testenv:pypy3-dj1.9.x] +basepython=pypy3 +deps = + Django>=1.9,<1.9.999 {[testenv]deps}