Administrator / django-contrib-comments · Commits

Commit 305b976ffab8c78c3b0957cdaff266753fc863a1

Authored by Claude Paroz
1 parent 6aad0531

Added Django 1.10 to the test matrix

Inline Side-by-side
Showing 2 changed files with 17 additions and 3 deletions
@@ -7,15 +7,20 @@ python: @@ -7,15 +7,20 @@ python:
7 env: 7 env:
8 - DJANGO="Django>=1.7,<1.8" 8 - DJANGO="Django>=1.7,<1.8"
9 - DJANGO="Django>=1.8,<1.9" 9 - DJANGO="Django>=1.8,<1.9"
10 - - DJANGO="Django<1.10" 10 + - DJANGO="Django>=1.9,<1.10"
  11 + - DJANGO="Django<1.11"
11 - DJANGO=https://github.com/django/django/archive/master.tar.gz 12 - DJANGO=https://github.com/django/django/archive/master.tar.gz
12 13
13 matrix: 14 matrix:
14 exclude: 15 exclude:
15 - python: "3.2" 16 - python: "3.2"
16 - env: DJANGO="Django<1.10" 17 + env: DJANGO="Django>=1.9,<1.10"
17 - python: "3.3" 18 - python: "3.3"
18 - env: DJANGO="Django<1.10" 19 + env: DJANGO="Django>=1.9,<1.10"
  20 + - python: "3.2"
  21 + env: DJANGO="Django<1.11"
  22 + - python: "3.3"
  23 + env: DJANGO="Django<1.11"
19 - python: "3.2" 24 - python: "3.2"
20 env: DJANGO=https://github.com/django/django/archive/master.tar.gz 25 env: DJANGO=https://github.com/django/django/archive/master.tar.gz
21 - python: "3.3" 26 - python: "3.3"
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
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-django110, py34-django110,
5 py27-master, py34-master 6 py27-master, py34-master
6 7
7 [testenv] 8 [testenv]
@@ -41,6 +42,14 @@ deps = Django>=1.9,<1.10 @@ -41,6 +42,14 @@ deps = Django>=1.9,<1.10
41 basepython = python3.4 42 basepython = python3.4
42 deps = Django>=1.9,<1.10 43 deps = Django>=1.9,<1.10
43 44
  45 +[testenv:py27-django110]
  46 +basepython = python2.7
  47 +deps = Django>=1.10,<1.11
  48 +
  49 +[testenv:py34-django110]
  50 +basepython = python3.4
  51 +deps = Django>=1.10,<1.11
  52 +
44 [testenv:py27-master] 53 [testenv:py27-master]
45 basepython = python2.7 54 basepython = python2.7
46 deps = https://github.com/django/django/archive/master.tar.gz 55 deps = https://github.com/django/django/archive/master.tar.gz
Please register or login to post a comment