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 18, 2015
1 parent 83d6741 commit 1d46a56
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 30 deletions.
5 changes: 2 additions & 3 deletions bootstrap.py
Expand Up @@ -2,10 +2,9 @@
import os
import sys
if not os.path.exists('.tox/configure'):
import virtualenv
import subprocess
print("Bootstrapping ...")
virtualenv.create_environment('.tox/configure')
subprocess.check_call(['virtualenv', '.tox/configure'])
print("Installing `jinja2` and `matrix` into bootstrap environment ...")
if sys.platform == 'win32':
subprocess.check_call(['.tox/configure/Scripts/pip', 'install', 'jinja2', 'matrix'])
Expand Down Expand Up @@ -43,4 +42,4 @@
fh.write(jinja.get_template(name).render(tox_environments=tox_environments))
print("Wrote %s" % name)

print("DONE.")
print("DONE.")
6 changes: 3 additions & 3 deletions setup.cfg
Expand Up @@ -61,10 +61,10 @@ python_versions =
pypy

dependencies =
1.4: Django==1.4.17 !python_versions[3.*]
1.4: Django==1.4.18 !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]
1.6: Django==1.6.10
1.7: Django==1.7.3 !python_versions[2.6]

coverage_flags =
: true
Expand Down
48 changes: 24 additions & 24 deletions tox.ini
Expand Up @@ -105,14 +105,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.4.17
Django==1.4.18

[testenv:2.6-1.4-nocover]
basepython = python2.6
deps =
{[testenv]deps}
pytest-cov
Django==1.4.17
Django==1.4.18

[testenv:2.6-1.5]
basepython = python2.6
Expand Down Expand Up @@ -145,14 +145,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

[testenv:2.6-1.6-nocover]
basepython = python2.6
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

[testenv:2.7-1.4]
basepython = python2.7
Expand All @@ -165,14 +165,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.4.17
Django==1.4.18

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

[testenv:2.7-1.5]
basepython = python2.7
Expand Down Expand Up @@ -205,14 +205,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

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

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

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

[testenv:3.3-1.5]
basepython = python3.3
Expand Down Expand Up @@ -265,14 +265,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

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

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

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

[testenv:3.4-1.5]
basepython = python3.4
Expand Down Expand Up @@ -325,14 +325,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

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

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

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

[testenv:pypy-1.4]
basepython = pypy
Expand All @@ -365,14 +365,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.4.17
Django==1.4.18

[testenv:pypy-1.4-nocover]
basepython = pypy
deps =
{[testenv]deps}
pytest-cov
Django==1.4.17
Django==1.4.18

[testenv:pypy-1.5]
basepython = pypy
Expand Down Expand Up @@ -405,14 +405,14 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

[testenv:pypy-1.6-nocover]
basepython = pypy
deps =
{[testenv]deps}
pytest-cov
Django==1.6.9
Django==1.6.10

[testenv:pypy-1.7]
basepython = pypy
Expand All @@ -425,12 +425,12 @@ commands =
deps =
{[testenv]deps}
pytest-cov
Django==1.7.2
Django==1.7.3

[testenv:pypy-1.7-nocover]
basepython = pypy
deps =
{[testenv]deps}
pytest-cov
Django==1.7.2
Django==1.7.3

0 comments on commit 1d46a56

Please sign in to comment.