Skip to content

Commit

Permalink
Update test deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Jan 3, 2015
1 parent d4412cc commit b13727b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 33 deletions.
9 changes: 4 additions & 5 deletions setup.cfg
@@ -1,5 +1,4 @@
[bdist_wheel]

universal = 1


Expand Down Expand Up @@ -65,10 +64,10 @@ python_versions =
pypy

dependencies =
1.4: Django==1.4.16 !python_versions[3.*]
1.5: Django==1.5.11
1.6: Django==1.6.8
1.7: Django==1.7.1 !python_versions[2.6]
1.4: Django==1.4.17 !python_versions[3.*]
1.5: Django==1.5.12
1.6: Django==1.6.9
1.7: Django==1.7.2 !python_versions[2.6]

coverage_flags =
: true
Expand Down
56 changes: 28 additions & 28 deletions tox.ini
Expand Up @@ -124,13 +124,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.4.16
Django==1.4.17

[testenv:2.7-1.4-nocover]
basepython = python2.7
deps =
{[testenv]deps}
Django==1.4.16
Django==1.4.17

[testenv:2.7-1.5]
basepython = python2.7
Expand All @@ -143,13 +143,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.5.11
Django==1.5.12

[testenv:2.7-1.5-nocover]
basepython = python2.7
deps =
{[testenv]deps}
Django==1.5.11
Django==1.5.12

[testenv:2.7-1.6]
basepython = python2.7
Expand All @@ -162,13 +162,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.8
Django==1.6.9

[testenv:2.7-1.6-nocover]
basepython = python2.7
deps =
{[testenv]deps}
Django==1.6.8
Django==1.6.9

[testenv:2.7-1.7]
basepython = python2.7
Expand All @@ -181,13 +181,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.7.1
Django==1.7.2

[testenv:2.7-1.7-nocover]
basepython = python2.7
deps =
{[testenv]deps}
Django==1.7.1
Django==1.7.2

[testenv:3.3-1.5]
basepython = python3.3
Expand All @@ -200,13 +200,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.5.11
Django==1.5.12

[testenv:3.3-1.5-nocover]
basepython = python3.3
deps =
{[testenv]deps}
Django==1.5.11
Django==1.5.12

[testenv:3.3-1.6]
basepython = python3.3
Expand All @@ -219,13 +219,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.8
Django==1.6.9

[testenv:3.3-1.6-nocover]
basepython = python3.3
deps =
{[testenv]deps}
Django==1.6.8
Django==1.6.9

[testenv:3.3-1.7]
basepython = python3.3
Expand All @@ -238,13 +238,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.7.1
Django==1.7.2

[testenv:3.3-1.7-nocover]
basepython = python3.3
deps =
{[testenv]deps}
Django==1.7.1
Django==1.7.2

[testenv:3.4-1.5]
basepython = python3.4
Expand All @@ -257,13 +257,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.5.11
Django==1.5.12

[testenv:3.4-1.5-nocover]
basepython = python3.4
deps =
{[testenv]deps}
Django==1.5.11
Django==1.5.12

[testenv:3.4-1.6]
basepython = python3.4
Expand All @@ -276,13 +276,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.8
Django==1.6.9

[testenv:3.4-1.6-nocover]
basepython = python3.4
deps =
{[testenv]deps}
Django==1.6.8
Django==1.6.9

[testenv:3.4-1.7]
basepython = python3.4
Expand All @@ -295,13 +295,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.7.1
Django==1.7.2

[testenv:3.4-1.7-nocover]
basepython = python3.4
deps =
{[testenv]deps}
Django==1.7.1
Django==1.7.2

[testenv:pypy-1.4]
basepython = pypy
Expand All @@ -314,13 +314,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.4.16
Django==1.4.17

[testenv:pypy-1.4-nocover]
basepython = pypy
deps =
{[testenv]deps}
Django==1.4.16
Django==1.4.17

[testenv:pypy-1.5]
basepython = pypy
Expand All @@ -333,13 +333,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.5.11
Django==1.5.12

[testenv:pypy-1.5-nocover]
basepython = pypy
deps =
{[testenv]deps}
Django==1.5.11
Django==1.5.12

[testenv:pypy-1.6]
basepython = pypy
Expand All @@ -352,13 +352,13 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.8
Django==1.6.9

[testenv:pypy-1.6-nocover]
basepython = pypy
deps =
{[testenv]deps}
Django==1.6.8
Django==1.6.9

[testenv:pypy-1.7]
basepython = pypy
Expand All @@ -371,11 +371,11 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.7.1
Django==1.7.2

[testenv:pypy-1.7-nocover]
basepython = pypy
deps =
{[testenv]deps}
Django==1.7.1
Django==1.7.2

0 comments on commit b13727b

Please sign in to comment.