Fix test matrix with tox-travis and various other ci-related fixes

jieter · Jun 21, 2017 · a2b7d3e · a2b7d3e
1 parent f114d9c
commit a2b7d3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,36 +1,15 @@
 language: python
 
-# django 2.0 is only supported on py35+
-# django 1.9 is only supported on py27 and py35
-matrix:
-  include:
-    - { python: 2.7, env: TOXENV=py27-1.8 }
-    - { python: 2.7, env: TOXENV=py27-1.9 }
-    - { python: 2.7, env: TOXENV=py27-1.10 }
-    - { python: 2.7, env: TOXENV=py27-1.11 }
-    - { python: 3.3, env: TOXENV=py33-1.8 }
-    - { python: 3.4, env: TOXENV=py34-1.8 }
-    - { python: 3.4, env: TOXENV=py34-1.9 }
-    - { python: 3.4, env: TOXENV=py34-1.10 }
-    - { python: 3.4, env: TOXENV=py34-1.11 }
-    - { python: 3.4, env: TOXENV=py34-master }
-    - { python: 3.5, env: TOXENV=py35-1.8 }
-    - { python: 3.5, env: TOXENV=py35-1.9 }
-    - { python: 3.5, env: TOXENV=py35-1.10 }
-    - { python: 3.5, env: TOXENV=py35-1.11 }
-    - { python: 3.5, env: TOXENV=py35-master }
-    - { python: 3.6, env: TOXENV=py36-master }
-    - { python: 2.7, env: TOXENV=docs }
-
-  # we allow failures for versions which are not yet released:
-  allow_failures:
-      - env: TOXENV=py34-master
-      - env: TOXENV=py35-master
-      - env: TOXENV=py36-master
+python:
+    - "2.7"
+    - "3.3"
+    - "3.4"
+    - "3.5"
+    - "3.6"
 
 install:
-  - pip install tox
-  - pip install python-coveralls
+  - pip install tox-travis python-coveralls
+
 script:
   - tox
 

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -11,7 +11,7 @@
 import django_tables2 as tables
 from django_tables2.tables import DeclarativeColumnsMetaclass
 
-from .utils import build_request, parse, attrs
+from .utils import build_request, parse
 
 request = build_request('/')
 

diff --git a/tox.ini b/tox.ini
@@ -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 =
@@ -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