Administrator / django-contrib-comments · Commits

Commit 0c8f02b6b7df8cb37ee387fc29a241fc184fdebe

Authored by Claude Paroz
1 parent 75f06852

Added django master to test matrix, allowing failures

Inline Side-by-side
Showing 2 changed files with 26 additions and 7 deletions
@@ -5,17 +5,27 @@ python: @@ -5,17 +5,27 @@ python:
5 - "3.3" 5 - "3.3"
6 - "3.4" 6 - "3.4"
7 env: 7 env:
8 - - DJANGO_PACKAGE="Django>=1.7,<1.8"  
9 - - DJANGO_PACKAGE="Django>=1.8,<1.9"  
10 - - DJANGO_PACKAGE="Django<1.10" 8 + - DJANGO="Django>=1.7,<1.8"
  9 + - DJANGO="Django>=1.8,<1.9"
  10 + - DJANGO="Django<1.10"
  11 + - DJANGO=https://github.com/django/django/archive/master.tar.gz
11 12
12 matrix: 13 matrix:
13 exclude: 14 exclude:
14 - python: "3.2" 15 - python: "3.2"
15 - env: DJANGO_PACKAGE="Django<1.10" 16 + env: DJANGO="Django<1.10"
16 - python: "3.3" 17 - python: "3.3"
17 - env: DJANGO_PACKAGE="Django<1.10" 18 + env: DJANGO="Django<1.10"
  19 + - python: "3.2"
  20 + env: DJANGO=https://github.com/django/django/archive/master.tar.gz
  21 + - python: "3.3"
  22 + env: DJANGO=https://github.com/django/django/archive/master.tar.gz
  23 + allow_failures:
  24 + - python: "2.7"
  25 + env: DJANGO=https://github.com/django/django/archive/master.tar.gz
  26 + - python: "3.4"
  27 + env: DJANGO=https://github.com/django/django/archive/master.tar.gz
18 28
19 install: 29 install:
20 - - pip install --pre $DJANGO_PACKAGE 30 + - pip install --pre $DJANGO
21 script: python setup.py test 31 script: python setup.py test
1 [tox] 1 [tox]
2 envlist = py27-django17, py32-django17, py33-django17, 2 envlist = py27-django17, py32-django17, py33-django17,
3 py27-django18, py32-django18, py33-django18, 3 py27-django18, py32-django18, py33-django18,
4 - py27-django19, py34-django19 4 + py27-django19, py34-django19,
  5 + py27-master, py34-master
5 6
6 [testenv] 7 [testenv]
7 commands = {envpython} setup.py test 8 commands = {envpython} setup.py test
@@ -39,3 +40,11 @@ deps = Django>=1.9,<1.10 @@ -39,3 +40,11 @@ deps = Django>=1.9,<1.10
39 [testenv:py34-django19] 40 [testenv:py34-django19]
40 basepython = python3.4 41 basepython = python3.4
41 deps = Django>=1.9,<1.10 42 deps = Django>=1.9,<1.10
  43 +
  44 +[testenv:py27-master]
  45 +basepython = python2.7
  46 +deps = https://github.com/django/django/archive/master.tar.gz
  47 +
  48 +[testenv:py34-master]
  49 +basepython = python3.4
  50 +deps = https://github.com/django/django/archive/master.tar.gz
Please register or login to post a comment