Skip to content

Commit

Permalink
Fix test matrix with tox-travis
Browse files Browse the repository at this point in the history
  • Loading branch information
jieter committed Jun 21, 2017
1 parent 3b76820 commit 257a51f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import django_tables2 as tables
from django_tables2.tables import DeclarativeColumnsMetaclass

from .utils import attrs, build_request, parse
from .utils import build_request, parse

request = build_request('/')

Expand Down
14 changes: 6 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ envlist =
{py27,py33,py34}-{1.8},
{py27,py34,py35}-{1.9,1.10,1.11},
{py34,py35,py36}-{master},
docs
flake8
isort
py27-{docs,flake8,isort}

[testenv]
basepython =
Expand All @@ -34,24 +32,24 @@ deps =
psycopg2
-r{toxinidir}/requirements/common.pip

[testenv:docs]
[testenv:py27-docs]
whitelist_externals = make
changedir = docs
commands = make html
basepython = python2.7
deps =
-r{toxinidir}/docs/requirements.txt

[testenv:flake8]
basepython = python3.6
[testenv:py27-flake8]
basepython = python2.7
deps = flake8
commands = flake8

[flake8]
ignore = F401,E731
max-line-length = 120

[testenv:isort]
[testenv:py27-isort]
deps = isort==4.2.15
basepython = python3.6
basepython = python2.7
commands = isort --diff --check --recursive {toxinidir}/django_tables2 {toxinidir}/tests {toxinidir}/example

0 comments on commit 257a51f

Please sign in to comment.