Use tox on Travis CI

Author: dyve

.travis.yml

@@ -1,50 +1,14 @@
-# We do not use sudo
 sudo: false
-
-# Python versions for matrix
 language: python
-python:
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
 
-# Django versions for matrix
-env:
-  - DJANGO_VERSION='>=1.8,<1.9'
-  - DJANGO_VERSION='>=1.9,<1.10'
-  - DJANGO_VERSION='>=1.10,<1.11'
-  - DJANGO_VERSION='>=1.11,<1.12'
+python:
+    - "2.7"
 
-# Command to install dependencies, e.g. pip install -r requirements.txt
 install:
-  - pip install Django$DJANGO_VERSION
-  # Coverage 4.0 no longer supports py32. Install an older version before
-  # coveralls tries to install the latest
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.2' ]]; then travis_retry pip install 'coverage<4.0'; fi
-  - pip install coveralls
+    - pip install tox-travis coveralls
 
-# Command to run tests, e.g. python setup.py test
 script:
-  - coverage run --source=bootstrap3 manage.py test
-
-matrix:
-  exclude:
-    - python: "3.2"
-      env: DJANGO_VERSION='>=1.9,<1.10'
-    - python: "3.2"
-      env: DJANGO_VERSION='>=1.10,<1.11'
-    - python: "3.2"
-      env: DJANGO_VERSION='>=1.11,<1.12'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.9,<1.10'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.10,<1.11'
-    - python: "3.3"
-      env: DJANGO_VERSION='>=1.11,<1.12'
+    - tox
 
-# Report to coveralls
 after_success:
-  - coveralls
+    - coveralls

HISTORY.rst

@@ -4,6 +4,14 @@ History
 -------
 
 
+Development (unreleased)
+++++++++++++++++++++++++
+
+* Fix invalid HTML in help texts (thanks @luksen)
+* Added `mark_safe` to placeholder (thanks @ppo)
+* Add unicode test for help_text
+
+
 8.2.2 (2017-04-03)
 +++++++++++++++++
 

requirements.txt renamed to requirements-dev.txt

@@ -6,29 +6,16 @@
 [tox]
 minversion=1.8.0
 envlist =
-    py27-django18,
-    py27-django19,
-    py27-django110,
-    py27-django111,
-
-    py33-django18,
-
-    py34-django18,
-    py34-django19,
-    py34-django110,
-    py34-django111,
-
-    py35-django19,
-    py35-django110,
-    py35-django111,
-
-    py36-django110,
-    py36-django111
+    {py27}-django{18,19,110,111}
+    {py33}-django{18}
+    {py34}-django{18,19,110,111}
+    {py35}-django{19,110,111}
+    {py36}-django{110,111}
 
 [testenv]
 commands = python manage.py test
 deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
-    django111: Django>=1.11b1,<2.0
+    django111: Django>=1.11,<2.0