Drop support for Django 1.8 (fixes #434)

zostera · May 1, 2018 · 9dd8870 · 9dd8870
1 parent 415ad0b
commit 9dd8870
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -6,6 +6,7 @@ History
 In Progress
 +++++++++++
 
+* Drop support for Django 1.8 (#434)
 * Switched to master as main branch, deleted other branches
 * Switched to twine for publication on PyPI
 

diff --git a/bootstrap3/tests.py b/bootstrap3/tests.py
@@ -315,7 +315,7 @@ def test_field_addons(self):
         form = TestForm()
         res = render_form(form)
         self.assertIn('<div class="input-group"><span class="input-group-addon">before</span><input', res)
-        self.assertIn('/><span class="input-group-addon">after</span></div>', res)
+        self.assertIn('><span class="input-group-addon">after</span></div>', res)
 
     def test_exclude(self):
         form = TestForm()

diff --git a/docs/conf.py b/docs/conf.py
@@ -263,5 +263,5 @@
 
         html_theme = 'sphinx_rtd_theme'
         html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    except:
+    except ImportError:
         pass
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,6 @@
 minversion = 1.8.0
 envlist =
     coverage-clean
-    {py27,py33,py34,py35}-django18
     {py27,py34,py35,py36}-django111
     {py35,py36}-django20
     {py35,py36}-djangomaster
@@ -14,7 +13,6 @@ envlist =
 commands = coverage run --append --source='./bootstrap3' manage.py test -v1 --noinput
 deps =
     coverage
-    django18: Django>=1.8,<1.9
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz
@@ -40,7 +38,7 @@ max-line-length = 120
 [testenv:docs]
 changedir = docs
 deps =
-    django>=1.8
+    django>=1.11
     sphinx
     sphinx_rtd_theme
 commands = sphinx-build -b html -d _build/doctrees   . _build/html