Merge branch 'release/9.1.0'

Author: dyve

.travis.yml

@@ -9,10 +9,11 @@ python:
     - "3.6"
 
 install:
+    - sudo apt-get install libgdal-dev
     - pip install tox-travis coveralls
 
 script:
     - tox
 
 after_success:
-    - coveralls
+    - coveralls

HISTORY.rst

@@ -4,6 +4,15 @@ History
 -------
 
 
+9.1.0
++++++
+
+* Mention `django-bootstrap4 <https://github.com/zostera/django-bootstrap4/>`_ in README
+* Rewrite `tox` test matrix to focus on Django releases rather than Python versions
+* Add tests for Django master branch (>= 2)
+* Add `label` override for `{% bootstrap_field %}`
+
+
 9.0.0 (2017-07-11)
 ++++++++++++++++++
 

README.rst

@@ -20,6 +20,12 @@ Write Django as usual, and let ``django-bootstrap3`` make template output into B
     :alt: Number of PyPI downloads per month
 
 
+Looking for Bootstrap 4?
+------------------------
+
+See https://github.com/zostera/django-bootstrap4.
+
+
 Requirements
 ------------
 
@@ -45,8 +51,6 @@ Installation
 
 3. In your templates, load the ``bootstrap3`` library and use the ``bootstrap_*`` tags:
 
-This app will soon require Django 1.8+, python 2.7+. Thanks for understanding.
-
 
 Example template
 ----------------

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '9.0.0'
+__version__ = '9.1.0'

bootstrap3/renderers.py

@@ -255,12 +255,14 @@ def __init__(self, field, *args, **kwargs):
         self.field_help = text_value(mark_safe(field.help_text)) if self.show_help and field.help_text else ''
         self.field_errors = [conditional_escape(text_value(error)) for error in field.errors]
 
+        self.label = kwargs.get('label', field.label)
+
         if 'placeholder' in kwargs:
             # Find the placeholder in kwargs, even if it's empty
             self.placeholder = kwargs['placeholder']
         elif get_bootstrap_setting('set_placeholder'):
             # If not found, see if we set the label
-            self.placeholder = field.label
+            self.placeholder = self.label
         else:
             # Or just set it to empty
             self.placeholder = ''
@@ -390,7 +392,7 @@ def list_to_class(self, html, klass):
     def put_inside_label(self, html):
         content = '{field} {label}'.format(
             field=html,
-            label=self.field.label,
+            label=self.label,
         )
         return render_label(
             content=mark_safe(content),
@@ -503,7 +505,7 @@ def get_label(self):
         if isinstance(self.widget, CheckboxInput):
             label = None
         else:
-            label = self.field.label
+            label = self.label
         if self.layout == 'horizontal' and not label:
             return mark_safe(' ')
         return label

bootstrap3/templatetags/bootstrap3.py

@@ -443,7 +443,10 @@ def bootstrap_field(*args, **kwargs):
                 * ``'large'``
 
         placeholder
-            Sets the placeholder text of a textbox
+            Set/overwrite the field's placeholder.
+
+        label
+            Overwrite the field's label.
 
         horizontal_label_class
             Class used on the label when the ``layout`` is set to ``horizontal``.
@@ -679,7 +682,7 @@ def bootstrap_alert(content, alert_type='info', dismissable=True):
 
     **Example**::
 
-        {% bootstrap_alert "Something went wrong" alert_type='error' %}
+        {% bootstrap_alert "Something went wrong" alert_type='danger' %}
 
     """
     return render_alert(content, alert_type, dismissable)

bootstrap3/tests.py

@@ -8,7 +8,7 @@
 from django.contrib.messages import constants as DEFAULT_MESSAGE_LEVELS
 from django.forms.formsets import formset_factory
 from django.template import engines
-from django.test import TestCase
+from django.test import TestCase, override_settings
 
 from .bootstrap import DBS3_SET_REQUIRED_SET_DISABLED
 from .exceptions import BootstrapError
@@ -131,7 +131,7 @@ class TestFormWithoutRequiredClass(TestForm):
 
 def render_template(text, context=None):
     """
-    Create a template ``text`` that first loads bootstrap3.
+    Create a template ``text``
     """
     template = engines['django'].from_string(text)
     if not context:
@@ -579,6 +579,25 @@ def test_attributes_consistency(self):
         attrs = form.fields['addon'].widget.attrs.copy()
         self.assertEqual(attrs, form.fields['addon'].widget.attrs)
 
+    def test_placeholder(self):
+        res = render_template_with_form('{% bootstrap_field form.sender %}')
+        self.assertIn('placeholder="Sender', res)
+
+    def test_overwrite_placeholder(self):
+        res = render_template_with_form('{% bootstrap_field form.sender placeholder="foo" %}')
+        self.assertIn('placeholder="foo', res)
+
+        # If set_placeholder is set, also consider label override for placeholder
+        res = render_template_with_form('{% bootstrap_field form.sender label="foo" %}')
+        self.assertNotIn('Sender', res)
+        self.assertIn('placeholder="foo', res)
+        self.assertIn('foo</label>', res)
+
+    def test_overwrite_label(self):
+        res = render_template_with_form('{% bootstrap_field form.sender label="foo" %}')
+        self.assertNotIn('Sender', res)
+        self.assertIn('foo', res)
+
 
 class ComponentsTest(TestCase):
     def test_icon(self):

docs/conf.py

@@ -14,8 +14,6 @@
 import os
 import sys
 
-import bootstrap3
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -25,6 +23,9 @@
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__))))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'testsettings'
 
+# Import bootstrap3 after sys.path has been tweaked
+import bootstrap3  # noqa
+
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

docs/settings.rst

@@ -47,7 +47,8 @@ The ``BOOTSTRAP3`` dict variable contains these settings and defaults:
         # Set HTML disabled attribute on disabled fields, for Django <= 1.8 only
         'set_disabled': False,
 
-        # Set placeholder attributes to label if no placeholder is provided
+        # Set placeholder attributes to label if no placeholder is provided.
+        # This also considers the 'label' option of {% bootstrap_field %} tags.
         'set_placeholder': True,
 
         # Class to indicate required (better to set this in your Django form)

testsettings.py

@@ -17,13 +17,15 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.gis',
 
     # We test this one
     'bootstrap3',
 )
 
-MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES
+try:
+    MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES
+except AttributeError:
+    pass
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',

tox.ini

@@ -2,11 +2,10 @@
 minversion = 1.8.0
 envlist =
     coverage-clean
-    py27-django{18,19,110,111}
-    py33-django{18}
-    py34-django{18,19,110,111}
-    py35-django{19,110,111}
-    py36-django{110,111}
+    {py27,py33,py34,py35}-django18
+    {py27,py34,py35}-django{19,110},
+    {py27,py34,py35,py36}-django111,
+    {py35,py36}-djangomaster
     coverage-report
     flake8
     docs
@@ -19,6 +18,7 @@ deps =
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:coverage-clean]
 commands = coverage erase