Administrator / django-contrib-comments · Commits

Commit a1215b947359eb8e7eb80a8305e72f9ea6dfb387

Authored by Claude Paroz
1 parent 21d1f702

Added Django 1.9 to test matrix

Inline Side-by-side
Showing 2 changed files with 22 additions and 3 deletions
@@ -4,10 +4,12 @@ python: @@ -4,10 +4,12 @@ python:
4 - "2.7" 4 - "2.7"
5 - "3.2" 5 - "3.2"
6 - "3.3" 6 - "3.3"
  7 + - "3.4"
7 env: 8 env:
8 - DJANGO_PACKAGE="Django>=1.6,<1.7" 9 - DJANGO_PACKAGE="Django>=1.6,<1.7"
9 - DJANGO_PACKAGE="Django>=1.7,<1.8" 10 - DJANGO_PACKAGE="Django>=1.7,<1.8"
10 - DJANGO_PACKAGE="Django>=1.8,<1.9" 11 - DJANGO_PACKAGE="Django>=1.8,<1.9"
  12 + - DJANGO_PACKAGE="Django<1.10"
11 13
12 matrix: 14 matrix:
13 exclude: 15 exclude:
@@ -15,8 +17,16 @@ matrix: @@ -15,8 +17,16 @@ matrix:
15 env: DJANGO_PACKAGE="Django>=1.7,<1.8" 17 env: DJANGO_PACKAGE="Django>=1.7,<1.8"
16 - python: "2.6" 18 - python: "2.6"
17 env: DJANGO_PACKAGE="Django>=1.8,<1.9" 19 env: DJANGO_PACKAGE="Django>=1.8,<1.9"
  20 + - python: "2.6"
  21 + env: DJANGO_PACKAGE="Django<1.10"
  22 + - python: "3.2"
  23 + env: DJANGO_PACKAGE="Django<1.10"
  24 + - python: "3.3"
  25 + env: DJANGO_PACKAGE="Django<1.10"
  26 + - python: "3.4"
  27 + env: DJANGO_PACKAGE="Django>=1.6,<1.7"
18 28
19 install: 29 install:
20 - - pip install $DJANGO_PACKAGE --use-mirrors  
21 - - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install --use-mirrors unittest2; fi 30 + - pip install --pre $DJANGO_PACKAGE
  31 + - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
22 script: python setup.py test 32 script: python setup.py test
1 [tox] 1 [tox]
2 envlist = py26-django16, py27-django16, py32-django16, py33-django16, 2 envlist = py26-django16, py27-django16, py32-django16, py33-django16,
3 py27-django17, py32-django17, py33-django17, 3 py27-django17, py32-django17, py33-django17,
4 - py27-django18, py32-django18, py33-django18 4 + py27-django18, py32-django18, py33-django18,
  5 + py27-django19, py34-django19
5 6
6 [testenv] 7 [testenv]
7 commands = {envpython} setup.py test 8 commands = {envpython} setup.py test
@@ -49,3 +50,11 @@ deps = Django>=1.8,<1.9 @@ -49,3 +50,11 @@ deps = Django>=1.8,<1.9
49 [testenv:py33-django18] 50 [testenv:py33-django18]
50 basepython = python3.3 51 basepython = python3.3
51 deps = Django>=1.8,<1.9 52 deps = Django>=1.8,<1.9
  53 +
  54 +[testenv:py27-django19]
  55 +basepython = python2.7
  56 +deps = Django>=1.9,<1.10
  57 +
  58 +[testenv:py34-django19]
  59 +basepython = python3.4
  60 +deps = Django>=1.9,<1.10
Please register or login to post a comment