Skip to content

Commit

Permalink
Fix Django 1.7 version pinning for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
macro1 committed Sep 10, 2014
1 parent 341aec1 commit c0afd7f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
- DJANGO=Django==1.4.13
- DJANGO=Django==1.5.8
- DJANGO=Django==1.6.5
- DJANGO=Django>=1.7
- DJANGO="Django>=1.7,<1.8"

install:
- pip install coverage coveralls $DJANGO --use-mirrors
Expand All @@ -22,14 +22,14 @@ matrix:
- python: 2.6
env: DJANGO=Django==1.6.5
- python: 2.6
env: DJANGO=Django>=1.7
env: DJANGO="Django>=1.7,<1.8"
- python: 3.2
env: DJANGO=Django==1.4.13
- python: 3.3
env: DJANGO=Django==1.4.13

include:
- python: 3.4
env: DJANGO=Django>=1.7
env: DJANGO="Django>=1.7,<1.8"

after_success: coveralls
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ deps =
[testenv:py27-1.7]
basepython = python2.7
deps =
django >= 1.7
django >= 1.7, < 1.8
coverage == 3.6

[testenv:py27-trunk]
Expand All @@ -98,7 +98,7 @@ deps =
[testenv:py32-1.7]
basepython = python3.2
deps =
django >= 1.7
django >= 1.7, < 1.8
coverage == 3.6

[testenv:py32-trunk]
Expand All @@ -123,7 +123,7 @@ deps =
[testenv:py33-1.7]
basepython = python3.3
deps =
django >= 1.7
django >= 1.7, < 1.8
coverage == 3.6

[testenv:py33-trunk]
Expand All @@ -135,7 +135,7 @@ deps =
[testenv:py34-1.7]
basepython = python3.4
deps =
django >= 1.7
django >= 1.7, < 1.8
coverage == 3.6

[testenv:py34-trunk]
Expand Down

0 comments on commit c0afd7f

Please sign in to comment.