Skip to content

Commit b1b3959

Browse files
committed
Skip objproxies on 2.6
1 parent 72a5555 commit b1b3959

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

ci/templates/tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ deps =
1919
pytest
2020
pytest-capturelog
2121
pytest-benchmark
22-
objproxies==0.9.4
2322
commands =
2423
python setup.py clean --all build_ext --force --inplace
2524
{posargs:py.test -vv --ignore=src}

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ python_versions =
6969
3.5
7070
pypy
7171
dependencies =
72-
:Django !python_versions[2.6]
72+
:Django objproxies==0.9.4 !python_versions[2.6]
7373
: &python_versions[2.6]
7474
coverage_flags =
7575
: true

tox.ini

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ deps =
2828
pytest
2929
pytest-capturelog
3030
pytest-benchmark
31-
objproxies==0.9.4
3231
commands =
3332
python setup.py clean --all build_ext --force --inplace
3433
{posargs:py.test -vv --ignore=src}
@@ -158,12 +157,14 @@ deps =
158157
{[testenv]deps}
159158
pytest-cov
160159
Django
160+
objproxies==0.9.4
161161

162162
[testenv:2.7-nocover]
163163
basepython = {env:TOXPYTHON:python2.7}
164164
deps =
165165
{[testenv]deps}
166166
Django
167+
objproxies==0.9.4
167168

168169
[testenv:3.3]
169170
basepython = {env:TOXPYTHON:python3.3}
@@ -179,12 +180,14 @@ deps =
179180
{[testenv]deps}
180181
pytest-cov
181182
Django
183+
objproxies==0.9.4
182184

183185
[testenv:3.3-nocover]
184186
basepython = {env:TOXPYTHON:python3.3}
185187
deps =
186188
{[testenv]deps}
187189
Django
190+
objproxies==0.9.4
188191

189192
[testenv:3.4]
190193
basepython = {env:TOXPYTHON:python3.4}
@@ -200,12 +203,14 @@ deps =
200203
{[testenv]deps}
201204
pytest-cov
202205
Django
206+
objproxies==0.9.4
203207

204208
[testenv:3.4-nocover]
205209
basepython = {env:TOXPYTHON:python3.4}
206210
deps =
207211
{[testenv]deps}
208212
Django
213+
objproxies==0.9.4
209214

210215
[testenv:3.5]
211216
basepython = {env:TOXPYTHON:python3.5}
@@ -221,12 +226,14 @@ deps =
221226
{[testenv]deps}
222227
pytest-cov
223228
Django
229+
objproxies==0.9.4
224230

225231
[testenv:3.5-nocover]
226232
basepython = {env:TOXPYTHON:python3.5}
227233
deps =
228234
{[testenv]deps}
229235
Django
236+
objproxies==0.9.4
230237

231238
[testenv:pypy]
232239
basepython = {env:TOXPYTHON:pypy}
@@ -242,12 +249,14 @@ deps =
242249
{[testenv]deps}
243250
pytest-cov
244251
Django
252+
objproxies==0.9.4
245253

246254
[testenv:pypy-nocover]
247255
basepython = {env:TOXPYTHON:pypy}
248256
deps =
249257
{[testenv]deps}
250258
Django
259+
objproxies==0.9.4
251260

252261

253262

0 commit comments

Comments
 (0)