Skip to content

Commit c0afd7f

Browse files
committed
Fix Django 1.7 version pinning for tests
1 parent 341aec1 commit c0afd7f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
- DJANGO=Django==1.4.13
1111
- DJANGO=Django==1.5.8
1212
- DJANGO=Django==1.6.5
13-
- DJANGO=Django>=1.7
13+
- DJANGO="Django>=1.7,<1.8"
1414

1515
install:
1616
- pip install coverage coveralls $DJANGO --use-mirrors
@@ -22,14 +22,14 @@ matrix:
2222
- python: 2.6
2323
env: DJANGO=Django==1.6.5
2424
- python: 2.6
25-
env: DJANGO=Django>=1.7
25+
env: DJANGO="Django>=1.7,<1.8"
2626
- python: 3.2
2727
env: DJANGO=Django==1.4.13
2828
- python: 3.3
2929
env: DJANGO=Django==1.4.13
3030

3131
include:
3232
- python: 3.4
33-
env: DJANGO=Django>=1.7
33+
env: DJANGO="Django>=1.7,<1.8"
3434

3535
after_success: coveralls

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ deps =
7373
[testenv:py27-1.7]
7474
basepython = python2.7
7575
deps =
76-
django >= 1.7
76+
django >= 1.7, < 1.8
7777
coverage == 3.6
7878

7979
[testenv:py27-trunk]
@@ -98,7 +98,7 @@ deps =
9898
[testenv:py32-1.7]
9999
basepython = python3.2
100100
deps =
101-
django >= 1.7
101+
django >= 1.7, < 1.8
102102
coverage == 3.6
103103

104104
[testenv:py32-trunk]
@@ -123,7 +123,7 @@ deps =
123123
[testenv:py33-1.7]
124124
basepython = python3.3
125125
deps =
126-
django >= 1.7
126+
django >= 1.7, < 1.8
127127
coverage == 3.6
128128

129129
[testenv:py33-trunk]
@@ -135,7 +135,7 @@ deps =
135135
[testenv:py34-1.7]
136136
basepython = python3.4
137137
deps =
138-
django >= 1.7
138+
django >= 1.7, < 1.8
139139
coverage == 3.6
140140

141141
[testenv:py34-trunk]

0 commit comments

Comments
 (0)