Skip to content

Commit 599daaf

Browse files
committed
Update test versions.
1 parent a98042b commit 599daaf

File tree

3 files changed

+31
-9
lines changed

3 files changed

+31
-9
lines changed

ci/templates/tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ deps =
1717
pytest
1818
pytest-capturelog
1919
pytest-benchmark
20-
Django==1.7.3
21-
objproxies==0.9.3
2220
commands =
2321
python setup.py clean --all build_ext --force --inplace
2422
{posargs:py.test -vv --ignore=src}

setup.cfg

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ python_versions =
6060
pypy
6161

6262
dependencies =
63-
# 1.4: Django==1.4.16 !python_versions[3.*]
64-
# 1.5: Django==1.5.11
65-
# 1.6: Django==1.6.8
66-
# 1.7: Django==1.7.1 !python_versions[2.6]
67-
# Deps commented above are provided as examples. That's what you would use in a Django project.
63+
:Django==1.7.4 objproxies==0.9.3
6864

6965
coverage_flags =
7066
: true

tox.ini

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ deps =
2424
pytest
2525
pytest-capturelog
2626
pytest-benchmark
27-
Django==1.7.3
28-
objproxies==0.9.3
2927
commands =
3028
python setup.py clean --all build_ext --force --inplace
3129
{posargs:py.test -vv --ignore=src}
@@ -117,9 +115,15 @@ commands =
117115
deps =
118116
{[testenv]deps}
119117
pytest-cov
118+
Django==1.7.4
119+
objproxies==0.9.3
120120

121121
[testenv:2.6-nocover]
122122
basepython = {env:TOXPYTHON:python2.6}
123+
deps =
124+
{[testenv]deps}
125+
Django==1.7.4
126+
objproxies==0.9.3
123127

124128
[testenv:2.7]
125129
basepython = {env:TOXPYTHON:python2.7}
@@ -134,9 +138,15 @@ commands =
134138
deps =
135139
{[testenv]deps}
136140
pytest-cov
141+
Django==1.7.4
142+
objproxies==0.9.3
137143

138144
[testenv:2.7-nocover]
139145
basepython = {env:TOXPYTHON:python2.7}
146+
deps =
147+
{[testenv]deps}
148+
Django==1.7.4
149+
objproxies==0.9.3
140150

141151
[testenv:3.3]
142152
basepython = {env:TOXPYTHON:python3.3}
@@ -151,9 +161,15 @@ commands =
151161
deps =
152162
{[testenv]deps}
153163
pytest-cov
164+
Django==1.7.4
165+
objproxies==0.9.3
154166

155167
[testenv:3.3-nocover]
156168
basepython = {env:TOXPYTHON:python3.3}
169+
deps =
170+
{[testenv]deps}
171+
Django==1.7.4
172+
objproxies==0.9.3
157173

158174
[testenv:3.4]
159175
basepython = {env:TOXPYTHON:python3.4}
@@ -168,9 +184,15 @@ commands =
168184
deps =
169185
{[testenv]deps}
170186
pytest-cov
187+
Django==1.7.4
188+
objproxies==0.9.3
171189

172190
[testenv:3.4-nocover]
173191
basepython = {env:TOXPYTHON:python3.4}
192+
deps =
193+
{[testenv]deps}
194+
Django==1.7.4
195+
objproxies==0.9.3
174196

175197
[testenv:pypy]
176198
basepython = {env:TOXPYTHON:pypy}
@@ -185,7 +207,13 @@ commands =
185207
deps =
186208
{[testenv]deps}
187209
pytest-cov
210+
Django==1.7.4
211+
objproxies==0.9.3
188212

189213
[testenv:pypy-nocover]
190214
basepython = {env:TOXPYTHON:pypy}
215+
deps =
216+
{[testenv]deps}
217+
Django==1.7.4
218+
objproxies==0.9.3
191219

0 commit comments

Comments
 (0)