Administrator / django-contrib-comments · Commits

Commit d4b178e16fa1335166f32218aaa2370dd6955d50

Authored by Jannis Leidel
2 parents 53559070 50a22d83

Merge pull request #7 from crccheck/testing-versions 

Fix test suites were pulling Django 1.7 stead of 1.6
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
@@ -6,6 +6,6 @@ python: @@ -6,6 +6,6 @@ python:
6 - "3.3" 6 - "3.3"
7 env: 7 env:
8 - DJANGO_PACKAGE="Django>=1.5,<1.6" 8 - DJANGO_PACKAGE="Django>=1.5,<1.6"
9 - - DJANGO_PACKAGE=https://github.com/django/django/archive/master.zip 9 + - DJANGO_PACKAGE="Django>=1.6,<1.7"
10 install: pip install $DJANGO_PACKAGE --use-mirrors 10 install: pip install $DJANGO_PACKAGE --use-mirrors
11 script: python setup.py test 11 script: python setup.py test
@@ -3,37 +3,37 @@ envlist = py26-django15, py27-django15, py32-django15, py33-django15, @@ -3,37 +3,37 @@ envlist = py26-django15, py27-django15, py32-django15, py33-django15,
3 py26-django16, py27-django16, py32-django16, py33-django16 3 py26-django16, py27-django16, py32-django16, py33-django16
4 4
5 [testenv] 5 [testenv]
6 -commands = python setup.py test 6 +commands = {envpython} setup.py test
7 7
8 [testenv:py26-django15] 8 [testenv:py26-django15]
9 basepython = python2.6 9 basepython = python2.6
10 -deps = Django==1.5 10 +deps = Django>=1.5,<1.6
11 11
12 [testenv:py27-django15] 12 [testenv:py27-django15]
13 basepython = python2.7 13 basepython = python2.7
14 -deps = Django==1.5 14 +deps = Django>=1.5,<1.6
15 15
16 [testenv:py32-django15] 16 [testenv:py32-django15]
17 basepython = python3.2 17 basepython = python3.2
18 -deps = Django==1.5 18 +deps = Django>=1.5,<1.6
19 19
20 [testenv:py33-django15] 20 [testenv:py33-django15]
21 basepython = python3.3 21 basepython = python3.3
22 -deps = Django==1.5 22 +deps = Django>=1.5,<1.6
23 23
24 [testenv:py26-django16] 24 [testenv:py26-django16]
25 basepython = python2.6 25 basepython = python2.6
26 -deps = https://github.com/django/django/archive/master.zip 26 +deps = Django>=1.6,<1.7
27 27
28 [testenv:py27-django16] 28 [testenv:py27-django16]
29 basepython = python2.7 29 basepython = python2.7
30 -deps = https://github.com/django/django/archive/master.zip 30 +deps = Django>=1.6,<1.7
31 31
32 [testenv:py32-django16] 32 [testenv:py32-django16]
33 basepython = python3.2 33 basepython = python3.2
34 -deps = https://github.com/django/django/archive/master.zip 34 +deps = Django>=1.6,<1.7
35 35
36 [testenv:py33-django16] 36 [testenv:py33-django16]
37 basepython = python3.3 37 basepython = python3.3
38 -deps = https://github.com/django/django/archive/master.zip 38 +deps = Django>=1.6,<1.7
39 39
Please register or login to post a comment