Switch to explicit Travis tests

.travis.yml

@@ -1,18 +1,34 @@
-sudo: false
 language: python
+cache:
+  pip: true
+addons:
+  postgresql: 9.6
+  apt:
+    packages:
+     - postgresql-9.6-postgis-2.3
 
-python:
-    - "2.7"
-    - "3.4"
-    - "3.5"
-    - "3.6"
+install: pip install tox tox-travis
+script: tox
 
-install:
-    - sudo apt-get install libgdal-dev
-    - pip install tox-travis coveralls
+matrix:
+  include:
+    - { python: 2.7, env: TOXENV=py27-1.11 }
+    - { python: 3.4, env: TOXENV=py34-1.11 }
+    - { python: 3.4, env: TOXENV=py34-2.0 }
+    - { python: 3.5, env: TOXENV=py35-1.11 }
+    - { python: 3.5, env: TOXENV=py35-2.0 }
+    - { python: 3.5, env: TOXENV=py35-2.1 }
+    - { python: 3.5, env: TOXENV=py35-master }
+    - { python: 3.6, env: TOXENV=py36-2.0 }
+    - { python: 3.6, env: TOXENV=py36-2.1 }
+    - { python: 3.6, env: TOXENV=py36-master }
+    - { python: 3.7-dev, env: TOXENV=py37-2.1 }
+    - { python: 3.7-dev, env: TOXENV=py37-master }
+    - { python: 3.6, env: TOXENV=docs }
+    - { python: 3.6, env: TOXENV=flake8 }
 
-script:
-    - tox
-
-after_success:
-    - coveralls
+  # we allow failures for versions which are not yet released:
+  allow_failures:
+      - env: TOXENV=py35-master
+      - env: TOXENV=py36-master
+      - env: TOXENV=py37-master

HISTORY.rst

@@ -2,6 +2,12 @@
 
 History
 -------
+- Switch to explicit Travis tests (#444)
+
+Development
++++++++++++++++++++
+
+* Fix PyPI classifiers
 
 10.0.1 (2018-05-02)
 +++++++++++++++++++

bootstrap3/tests.py

@@ -531,8 +531,8 @@ def test_input_group(self):
 
     def test_input_group_addon_button(self):
         res = render_template_with_form(
-            '{% bootstrap_field form.subject addon_before="$" addon_before_class="input-group-btn" addon_after=".00" addon_after_class="input-group-btn" %}'
-        )  # noqa
+            '{% bootstrap_field form.subject addon_before="$" addon_before_class="input-group-btn" addon_after=".00" addon_after_class="input-group-btn" %}'  # noqa
+        )
         self.assertIn('class="input-group"', res)
         self.assertIn('class="input-group-btn">$', res)
         self.assertIn('class="input-group-btn">.00', res)

testsettings.py

@@ -1,5 +1,3 @@
-import django.conf.global_settings as DEFAULT_SETTINGS
-
 SECRET_KEY = "bootstrap3isawesome"
 
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}
@@ -16,6 +14,11 @@
     "bootstrap3",
 )
 
+MIDDLEWARE = [
+    "django.contrib.auth.middleware.AuthenticationMiddleware",  # required for django.contrib.admin
+    "django.contrib.messages.middleware.MessageMiddleware",  # required for django.contrib.admin
+]
+
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",

tox.ini

@@ -1,45 +1,47 @@
 [tox]
-minversion = 1.8.0
 envlist =
-    coverage-clean
-    {py27,py34,py35,py36}-django111
-    {py35,py36}-django20
-    {py35,py36}-djangomaster
-    coverage-report
+    {py27}-{1.11},
+    {py34}-{1.11,2.0},
+    {py35}-{1.11,2.0,2.1,master},
+    {py36}-{1.11,2.0,2.1,master}
+    {py37}-{2.1,master}
     flake8
     docs
 
 [testenv]
-commands = coverage run --append --source='./bootstrap3' manage.py test -v1 --noinput
+setenv =
+    PYTHONWARNINGS=module::DeprecationWarning
+commands =
+    coverage run --source=bootstrap3 manage.py test -v1 --noinput
+    coverage report -m
 deps =
     coverage
-    django111: Django>=1.11,<2.0
-    django20: Django>=2.0,<2.1
-    djangomaster: https://github.com/django/django/archive/master.tar.gz
-
-[testenv:coverage-clean]
-commands = coverage erase
+    1.11: Django>=1.11,<2.0
+    2.0: Django>=2.0,<2.1
+    2.1: Django==2.1
+    master: https://github.com/django/django/archive/master.tar.gz
 
-[testenv:coverage-report]
-commands =
-    coverage report
-    coverage html
+[testenv:docs]
+basepython = python
+changedir = docs
+deps =
+    Django>=1.11,<1.12
+    sphinx
+    sphinx_rtd_theme
+commands = sphinx-build -b html -d _build/doctrees . _build/html
 
 [testenv:flake8]
 basepython = python3.6
-commands = flake8
 deps = flake8
+commands = flake8
 
 [flake8]
-ignore = F401,E731,E501,W503
+ignore = F401,E731,W503
 exclude = .git,.tox,__pycache__
-max-line-length = 80
-select = C,E,F,W,B,B950
+max-line-length = 120
 
-[testenv:docs]
-changedir = docs
-deps =
-    django>=1.11
-    sphinx
-    sphinx_rtd_theme
-commands = sphinx-build -b html -d _build/doctrees   . _build/html
+[travis]
+python:
+    2.7: py27
+    3.6: py36, docs, flake8
+    3.7-dev: py37