Skip to content

Commit 9f8bb8d

Browse files
committed
Don't test Django's proxy on 2.6 anymore.
1 parent 6d22050 commit 9f8bb8d

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

ci/templates/tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ deps =
1717
pytest
1818
pytest-capturelog
1919
pytest-benchmark
20+
objproxies==0.9.3
2021
commands =
2122
python setup.py clean --all build_ext --force --inplace
2223
{posargs:py.test -vv --ignore=src}

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ python_versions =
6363
pypy
6464

6565
dependencies =
66-
:Django objproxies==0.9.3
66+
:Django !python_versions[2.6]
67+
: &python_versions[2.6]
6768

6869
coverage_flags =
6970
: true

tox.ini

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ deps =
2424
pytest
2525
pytest-capturelog
2626
pytest-benchmark
27+
objproxies==0.9.3
2728
commands =
2829
python setup.py clean --all build_ext --force --inplace
2930
{posargs:py.test -vv --ignore=src}
@@ -115,15 +116,9 @@ commands =
115116
deps =
116117
{[testenv]deps}
117118
pytest-cov
118-
Django
119-
objproxies==0.9.3
120119

121120
[testenv:2.6-nocover]
122121
basepython = {env:TOXPYTHON:python2.6}
123-
deps =
124-
{[testenv]deps}
125-
Django
126-
objproxies==0.9.3
127122

128123
[testenv:2.7]
129124
basepython = {env:TOXPYTHON:python2.7}
@@ -139,14 +134,12 @@ deps =
139134
{[testenv]deps}
140135
pytest-cov
141136
Django
142-
objproxies==0.9.3
143137

144138
[testenv:2.7-nocover]
145139
basepython = {env:TOXPYTHON:python2.7}
146140
deps =
147141
{[testenv]deps}
148142
Django
149-
objproxies==0.9.3
150143

151144
[testenv:3.3]
152145
basepython = {env:TOXPYTHON:python3.3}
@@ -162,14 +155,12 @@ deps =
162155
{[testenv]deps}
163156
pytest-cov
164157
Django
165-
objproxies==0.9.3
166158

167159
[testenv:3.3-nocover]
168160
basepython = {env:TOXPYTHON:python3.3}
169161
deps =
170162
{[testenv]deps}
171163
Django
172-
objproxies==0.9.3
173164

174165
[testenv:3.4]
175166
basepython = {env:TOXPYTHON:python3.4}
@@ -185,14 +176,12 @@ deps =
185176
{[testenv]deps}
186177
pytest-cov
187178
Django
188-
objproxies==0.9.3
189179

190180
[testenv:3.4-nocover]
191181
basepython = {env:TOXPYTHON:python3.4}
192182
deps =
193183
{[testenv]deps}
194184
Django
195-
objproxies==0.9.3
196185

197186
[testenv:pypy]
198187
basepython = {env:TOXPYTHON:pypy}
@@ -208,12 +197,10 @@ deps =
208197
{[testenv]deps}
209198
pytest-cov
210199
Django
211-
objproxies==0.9.3
212200

213201
[testenv:pypy-nocover]
214202
basepython = {env:TOXPYTHON:pypy}
215203
deps =
216204
{[testenv]deps}
217205
Django
218-
objproxies==0.9.3
219206

0 commit comments

Comments
 (0)